diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 333d08bb6..f0fe37653 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -204,10 +204,13 @@ public class MainActivity extends Activity {
 		if(_screenKeyboard == null)
 			return;
 		String text = _screenKeyboard.getText().toString();
-		for(int i = 0; i < text.length(); i++)
+		if( mGLView != null )
 		{
-			if( mGLView != null )
+			for(int i = 0; i < text.length(); i++)
+			{
 				 mGLView.nativeTextInput( text.charAt(i), text.codePointAt(i) );
+			}
+			mGLView.nativeTextInput( 13, 13 ); // Send return
 		}
 		_videoLayout.removeView(_screenKeyboard);
 		_screenKeyboard = null;
@@ -273,10 +276,6 @@ public class MainActivity extends Activity {
 	
 	@Override
 	public boolean dispatchTouchEvent(final MotionEvent ev) {
-		// ----- DEBUG -----
-		//if( ev.getX() < 200.0 && ev.getY() < 50.0 && ev.getAction() == MotionEvent.ACTION_DOWN )
-		//	showScreenKeyboard();
-		// ----- DEBUG -----
 		if(_screenKeyboard != null)
 			_screenKeyboard.dispatchTouchEvent(ev);
 		else
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 2414b8d96..936b5efd6 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -80,7 +80,11 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
 
 LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH)
 
-$(LOCAL_PATH)/src/libapplication.so: $(LOCAL_PATH)/src/AndroidBuild.sh $(LOCAL_PATH)/src/AndroidAppSettings.cfg
+APP_LIB_DEPENDS := $(foreach LIB, $(LOCAL_SHARED_LIBRARIES), $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).so)) \
+					$(foreach LIB, $(LOCAL_STATIC_LIBRARIES), $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).a))
+
+
+$(LOCAL_PATH)/src/libapplication.so: $(LOCAL_PATH)/src/AndroidBuild.sh $(LOCAL_PATH)/src/AndroidAppSettings.cfg $(APP_LIB_DEPENDS)
 	echo Launching script $(LOCAL_PATH_SDL_APPLICATION)/AndroidBuild.sh
 	cd $(LOCAL_PATH_SDL_APPLICATION)/src && ./AndroidBuild.sh
 
diff --git a/project/jni/application/src b/project/jni/application/src
index 57d37d935..f36c75d23 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-pachi
\ No newline at end of file
+scummvm
\ No newline at end of file