diff --git a/project/jni/application/gemrb-sdl-1.3/AndroidAppSettings.cfg b/project/jni/application/gemrb-sdl-1.3/AndroidAppSettings.cfg
index a126e5184..c77a721a7 100644
--- a/project/jni/application/gemrb-sdl-1.3/AndroidAppSettings.cfg
+++ b/project/jni/application/gemrb-sdl-1.3/AndroidAppSettings.cfg
@@ -27,13 +27,13 @@ NonBlockingSwapBuffers=n
 RedefinedKeys="LCTRL C NO_REMAP NO_REMAP E"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
-RedefinedKeysScreenKb="LCTRL C NO_REMAP NO_REMAP E"
+RedefinedKeysScreenKb="UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN"
 StartupMenuButtonTimeout=2000
 HiddenMenuOptions=''
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=0644
-AppVersionName="0.6.4.4"
+AppVersionCode=0646
+AppVersionName="0.6.4.6"
 ResetSdlConfigForThisVersion=n
 CompiledLibraries="sdl_mixer ogg vorbis openal png python"
 CustomBuildScript=n
diff --git a/project/jni/application/src b/project/jni/application/src
index 104f796a6..0a7ca3edf 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
\ No newline at end of file
+gemrb-sdl-1.3
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
index 0de7bf115..bc78c724c 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
@@ -1516,9 +1516,9 @@ extern void SDL_ANDROID_MainThreadPushKeyboardKey(int pressed, SDL_scancode key)
 #if SDL_VERSION_ATLEAST(1,3,0)
 #else
 	if ( SDL_TranslateUNICODE )
-		ev->key.keysym.unicode = key;
 #endif
-	
+		ev->key.keysym.unicode = key;
+
 	BufferedEventsEnd = nextEvent;
 	SDL_mutexV(BufferedEventsMutex);
 };
@@ -1601,12 +1601,6 @@ extern void SDL_ANDROID_MainThreadPushMultitouchMotion(int id, int x, int y, int
 #endif
 };
 
-#if SDL_VERSION_ATLEAST(1,3,0)
-extern void SDL_ANDROID_DeferredTextInput()
-{
-};
-#else
-
 enum { DEFERRED_TEXT_COUNT = 256 };
 static struct { int scancode; int unicode; int down; } deferredText[DEFERRED_TEXT_COUNT];
 static int deferredTextIdx1 = 0;
@@ -1620,7 +1614,11 @@ static SDL_keysym asciiToKeysym(int ascii, int unicode)
 	keysym.sym = ascii;
 	keysym.mod = KMOD_NONE;
 	keysym.unicode = 0;
+#if SDL_VERSION_ATLEAST(1,3,0)
+	keysym.sym = SDL_GetScancodeFromKey(ascii);
+#else
 	if ( SDL_TranslateUNICODE )
+#endif
 		keysym.unicode = unicode;
 	return keysym;
 }
@@ -1687,7 +1685,6 @@ void SDL_ANDROID_DeferredTextInput()
 	
 	SDL_mutexV(deferredTextMutex);
 };
-#endif
 
 extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
 {
@@ -1705,7 +1702,7 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
 	ev->type = SDL_TEXTINPUT;
 	UnicodeToUtf8(unicode, ev->text.text);
 
-#else
+#endif
 
 	if( !deferredTextMutex )
 		deferredTextMutex = SDL_CreateMutex();
@@ -1750,8 +1747,6 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
 
 	SDL_mutexV(deferredTextMutex);
 
-#endif
-	
 	BufferedEventsEnd = nextEvent;
 	SDL_mutexV(BufferedEventsMutex);
 };
diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c b/project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
index 05bfc7137..4ddecf3f7 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_androidvideo-1.3.c
@@ -67,10 +67,6 @@ static void ANDROID_PumpEvents(_THIS);
 static int ANDROID_CreateWindow(_THIS, SDL_Window * window);
 static void ANDROID_DestroyWindow(_THIS, SDL_Window * window);
 
-static void ANDROID_StartTextInput(_THIS);
-static void ANDROID_StopTextInput(_THIS);
-static void ANDROID_SetTextInputRect(_THIS, SDL_Rect *rect);
-
 void * glLibraryHandle = NULL;
 void * gl2LibraryHandle = NULL;
 
@@ -123,10 +119,6 @@ static SDL_VideoDevice *ANDROID_CreateDevice(int devindex)
 	device->CreateWindow = ANDROID_CreateWindow;
 	device->DestroyWindow = ANDROID_DestroyWindow;
 	
-	device->StartTextInput = ANDROID_StartTextInput;
-	device->StopTextInput = ANDROID_StopTextInput;
-	device->SetTextInputRect = ANDROID_SetTextInputRect;
-
 	device->free = ANDROID_DeleteDevice;
 
 	glLibraryHandle = dlopen("libGLESv1_CM.so", RTLD_NOW | RTLD_GLOBAL);
@@ -259,17 +251,6 @@ void ANDROID_DestroyWindow(_THIS, SDL_Window * window)
 	ANDROID_CurrentWindow = NULL;
 };
 
-static void ANDROID_StartTextInput(_THIS)
-{
-	SDL_ANDROID_ToggleScreenKeyboardTextInput(NULL);
-};
-static void ANDROID_StopTextInput(_THIS)
-{
-};
-static void ANDROID_SetTextInputRect(_THIS, SDL_Rect *rect)
-{
-};
-
 static void* ANDROID_GL_GetProcAddress(_THIS, const char *proc)
 {
 	void * func = dlsym(glLibraryHandle, proc);