diff --git a/android/android.make b/android/android.make
index f12b79750d..56b650a7af 100644
--- a/android/android.make
+++ b/android/android.make
@@ -68,7 +68,7 @@ JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDD
 
 .PHONY:
 $(MANIFEST): $(MANIFEST_SRC) $(DIRS)
-	$(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST)
+	$(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/;s/screenOrientation="portrait"/screenOrientation="$(LCDORIENTATION)"/' $(MANIFEST_SRC) > $(MANIFEST)
 
 $(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS)
 	$(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \
diff --git a/tools/configure b/tools/configure
index d988e75d63..461e00ce8f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -28,6 +28,7 @@ sharedir=
 thread_support="ASSEMBLER_THREADS"
 app_lcd_width=
 app_lcd_height=
+app_lcd_orientation=
 #
 # Begin Function Definitions
 #
@@ -100,7 +101,12 @@ app_set_lcd_size () {
         app_lcd_height="$ARG_LCDHEIGHT"
     fi
     if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi
-    echo "Selected $app_lcd_width x $app_lcd_height resolution"
+    if [ $app_lcd_width -gt $app_lcd_height ]; then
+        lcd_orientation="landscape"
+    else
+        lcd_orientation="portrait"
+    fi
+    echo "Selected $app_lcd_width x $app_lcd_height resolution ($lcd_orientation)"
     ARG_LCDWIDTH=$app_lcd_width
     ARG_LCDHEIGHT=$app_lcd_height
 
@@ -3715,6 +3721,7 @@ sed > Makefile \
  -e "s<@PREFIX@<$ARG_PREFIX<g" \
  -e "s<@CMDLINE@<$cmdline<g" \
  -e "s<@SDLCONFIG@<$sdl<g" \
+ -e "s<@LCDORIENTATION@<$lcd_orientation<g" \
 <<EOF
 ## Automatically generated. http://www.rockbox.org/
 
@@ -3784,6 +3791,7 @@ export ROCKBOX_SHARE_PATH=@sharepath@
 export ROCKBOX_BINARY_PATH=@binpath@
 export ROCKBOX_LIBRARY_PATH=@libpath@
 export SDLCONFIG=@SDLCONFIG@
+export LCDORIENTATION=@LCDORIENTATION@
 
 CONFIGURE_OPTIONS=@CMDLINE@