diff --git a/project/jni/application/scummvm/AndroidAppSettings.cfg b/project/jni/application/scummvm/AndroidAppSettings.cfg
index fb79b8e0c..578cba086 100644
--- a/project/jni/application/scummvm/AndroidAppSettings.cfg
+++ b/project/jni/application/scummvm/AndroidAppSettings.cfg
@@ -1,5 +1,5 @@
 # The application settings for Android libSDL port
-AppSettingVersion=14
+AppSettingVersion=15
 LibSdlVersion=1.2
 AppName="ScummVM"
 AppFullName=org.scummvm.sdl
@@ -29,4 +29,5 @@ AppCflags=''
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=n
+AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/scummvm/scummvm-1.2.0.diff b/project/jni/application/scummvm/scummvm-1.2.0.diff
index 081f134d9..513ffae14 100644
--- a/project/jni/application/scummvm/scummvm-1.2.0.diff
+++ b/project/jni/application/scummvm/scummvm-1.2.0.diff
@@ -78,3 +78,106 @@ Index: configure
  	;;
  *)
  	CXXFLAGS="$CXXFLAGS -pedantic"
+Index: backends/platform/sdl/events.cpp
+===================================================================
+--- backends/platform/sdl/events.cpp	(revision 54149)
++++ backends/platform/sdl/events.cpp	(working copy)
+@@ -47,6 +47,9 @@
+ #define JOY_BUT_SPACE 4
+ #define JOY_BUT_F5 5
+ 
++#ifdef ANDROID
++static int _lastEventFromKbdMouse = 0;
++#endif
+ 
+ 
+ 
+@@ -347,8 +350,26 @@
+ 	return true;
+ }
+ 
++#ifdef ANDROID
++static void MoveMouseWithArrowKeys(SDL_Event &ev, int x, int y)
++{
++	if( _lastEventFromKbdMouse && abs( ev.button.x - x ) < 50 && abs( ev.button.y - y ) < 50 )
++	{
++		ev.button.x = x;
++		ev.button.y = y;
++	}
++	else
++		_lastEventFromKbdMouse = 0;
++}
++#endif
++
+ bool OSystem_SDL::handleMouseMotion(SDL_Event &ev, Common::Event &event) {
+ 	event.type = Common::EVENT_MOUSEMOVE;
++
++#ifdef ANDROID
++	MoveMouseWithArrowKeys(ev, _km.x, _km.y);
++#endif
++
+ 	fillMouseEvent(event, ev.motion.x, ev.motion.y);
+ 
+ 	setMousePos(event.mouse.x, event.mouse.y);
+@@ -373,6 +394,10 @@
+ 	else
+ 		return false;
+ 
++#ifdef ANDROID
++	MoveMouseWithArrowKeys(ev, _km.x, _km.y);
++#endif
++
+ 	fillMouseEvent(event, ev.button.x, ev.button.y);
+ 
+ 	return true;
+@@ -389,6 +414,11 @@
+ #endif
+ 	else
+ 		return false;
++
++#ifdef ANDROID
++	MoveMouseWithArrowKeys(ev, _km.x, _km.y);
++#endif
++
+ 	fillMouseEvent(event, ev.button.x, ev.button.y);
+ 
+ 	return true;
+@@ -569,5 +599,38 @@
+ 		event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+ 	}
+ #endif
++
++#ifdef ANDROID
++	if (ev.key.keysym.sym == SDLK_LEFT || ev.key.keysym.sym == SDLK_RIGHT || ev.key.keysym.sym == SDLK_UP || ev.key.keysym.sym == SDLK_DOWN) {
++
++		if (ev.key.keysym.sym == SDLK_LEFT || ev.key.keysym.sym == SDLK_RIGHT) {
++			if (ev.type == SDL_KEYDOWN) {
++				_km.x_vel = (ev.key.keysym.sym == SDLK_LEFT ? -1 : 1);
++				_km.x_down_count = 1;
++			} else {
++				_km.x_vel = 0;
++				_km.x_down_count = 0;
++			}
++		}
++
++		if (ev.key.keysym.sym == SDLK_UP || ev.key.keysym.sym == SDLK_DOWN) {
++			if (ev.type == SDL_KEYDOWN) {
++				_km.y_vel = (ev.key.keysym.sym == SDLK_UP ? -1 : 1);
++				_km.y_down_count = 1;
++			} else {
++				_km.y_vel = 0;
++				_km.y_down_count = 0;
++			}
++		}
++
++		event.type = Common::EVENT_MOUSEMOVE;
++		fillMouseEvent(event, _km.x, _km.y);
++		setMousePos(event.mouse.x, event.mouse.y);
++		_lastEventFromKbdMouse = 1;
++
++		return true;
++	}
++#endif
++  
+ 	return false;
+ }
diff --git a/project/jni/application/src b/project/jni/application/src
index 550b7b622..f36c75d23 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-openttd
\ No newline at end of file
+scummvm
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
index cf38dd620..dbef1ce9c 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
@@ -746,8 +746,8 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv*  env, jobject thi
 		}
 		buttons[6].x = 0;
 		buttons[6].y = 0;
-		buttons[6].w = 30;
-		buttons[6].h = 30;
+		buttons[6].w = SDL_ANDROID_sWindowHeight/15;
+		buttons[6].h = SDL_ANDROID_sWindowHeight/15;
 	}
 
 	if( !showArrows )