diff --git a/project/jni/application/simutrans/AndroidAppSettings.cfg b/project/jni/application/simutrans/AndroidAppSettings.cfg
index a2fa50bb0..4382b6278 100644
--- a/project/jni/application/simutrans/AndroidAppSettings.cfg
+++ b/project/jni/application/simutrans/AndroidAppSettings.cfg
@@ -23,7 +23,8 @@ InhibitSuspend=n
 # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
 # these files are put inside .apk package by build system
 # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
-AppDataDownloadUrl="!!Data pak|data.zip^!!GFX paks|paks.zip|http://sourceforge.net/projects/libsdl-android/files/Simutrans/paks.zip/download^!!MIDI music support|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip"
+#AppDataDownloadUrl="!!Data pak|data.zip^!!GFX paks|paks.zip|http://sourceforge.net/projects/libsdl-android/files/Simutrans/paks.zip/download^!!MIDI music support|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip"
+AppDataDownloadUrl="!!Data pak|data.zip^!!GFX paks|paks.zip^!!MIDI music support|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip"
 
 # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
 # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
@@ -44,7 +45,7 @@ NeedGles2=n
 SwVideoMode=y
 
 # Application video output will be resized to fit into native device screen (y)/(n)
-SdlVideoResize=y
+SdlVideoResize=n
 
 # Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n)
 SdlVideoResizeKeepAspect=n
@@ -79,10 +80,10 @@ CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState=
 AppUsesMouse=y
 
 # Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n)
-AppNeedsTwoButtonMouse=y
+AppNeedsTwoButtonMouse=n
 
 # Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n)
-ShowMouseCursor=n
+ShowMouseCursor=y
 
 # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
 ForceRelativeMouseMode=n
@@ -205,7 +206,8 @@ AppSubdirsBuild=''
 AppBuildExclude=''
 
 # Application command line parameters, including app name as 0-th param
-AppCmdline='simutrans -use_workdir -screensize 800x480 -fullscreen'
+AppCmdline='simutrans -use_workdir -screensize 800x600 -fullscreen'
+#AppCmdline='simutrans -use_workdir -fullscreen'
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?)
diff --git a/project/jni/application/simutrans/AndroidBuild.sh b/project/jni/application/simutrans/AndroidBuild.sh
index 1d7dfd367..942959434 100755
--- a/project/jni/application/simutrans/AndroidBuild.sh
+++ b/project/jni/application/simutrans/AndroidBuild.sh
@@ -3,10 +3,11 @@
 if [ -e simutrans ]; then
 	echo Already downloaded
 else
-	svn co --username anon --password '' svn://tron.homeunix.org/simutrans/simutrans/trunk simutrans || exit 1
-	cd simutrans/simutrans || exit 1
+	svn checkout https://github.com/aburch/simutrans/trunk simutrans || exit 1
+	patch -p0 < simutrans.patch || exit 1
+	cd simutrans || exit 1
 	./get_lang_files.sh || exit 1
-	cd ../..
+	cd ..
 fi
 
 mkdir -p AndroidData
diff --git a/project/jni/application/simutrans/simutrans.patch b/project/jni/application/simutrans/simutrans.patch
new file mode 100644
index 000000000..594fbb446
--- /dev/null
+++ b/project/jni/application/simutrans/simutrans.patch
@@ -0,0 +1,33 @@
+--- simutrans/simmain.cc	2014-08-02 23:17:18.000000000 +0200
++++ simutrans/simmain.cc	2014-08-02 23:10:51.000000000 +0200
+@@ -77,6 +77,9 @@
+ #include "vehicle/simvehikel.h"
+ #include "vehicle/simverkehr.h"
+ 
++#include <SDL.h>
++#include <SDL_screenkeyboard.h>
++
+ using std::string;
+ 
+ /* diagnostic routine:
+@@ -790,6 +793,20 @@
+ 		}
+ 	}
+ 
++
++
++
++	SDL_Rect r;
++	r.h = disp_width / 30;
++	r.w = r.h;
++	r.x = disp_width - r.w;
++	r.y = r.h;
++	SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDROID_SCREENKEYBOARD_BUTTON_TEXT, &r);
++
++
++
++
++
+ 	dbg->important("Preparing display ...");
+ 	DBG_MESSAGE("simmain", "simgraph_init disp_width=%d, disp_height=%d, fullscreen=%d", disp_width, disp_height, fullscreen);
+ 	simgraph_init(disp_width, disp_height, fullscreen);