diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index f05c59500..1b1938414 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -127,13 +127,13 @@ NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP"
 
 # Number of virtual keyboard keys (currently 6 is maximum)
-AppTouchscreenKeyboardKeysAmount=3
+AppTouchscreenKeyboardKeysAmount=4
 
 # Number of virtual keyboard keys that support autofire (currently 2 is maximum)
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 
 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
-RedefinedKeysScreenKb="SPACE PAGEUP PAGEDOWN TAB"
+RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB"
 
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
 RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores"
diff --git a/project/jni/application/teeworlds/AndroidPreBuild.sh b/project/jni/application/teeworlds/AndroidPreBuild.sh
index 0c08e27af..d91642994 100755
--- a/project/jni/application/teeworlds/AndroidPreBuild.sh
+++ b/project/jni/application/teeworlds/AndroidPreBuild.sh
@@ -3,10 +3,12 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
+cd $LOCAL_PATH/src
+
+[ -n "`find datasrc/*.py -cnewer src/game/generated/protocol.cpp 2>&1`" ] && {
 echo "Building autogenerated files"
 python --version > /dev/null 2>&1 || { echo "Error: no Python installed" ; exit 1 ; }
 
-cd $LOCAL_PATH/src
 python datasrc/compile.py network_source > src/game/generated/protocol.cpp
 python datasrc/compile.py network_header > src/game/generated/protocol.h
 python datasrc/compile.py client_content_source > src/game/generated/client_data.cpp
@@ -15,10 +17,12 @@ python datasrc/compile.py server_content_source > src/game/generated/server_data
 python datasrc/compile.py server_content_header > src/game/generated/server_data.h
 
 python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp
+}
 
+[ -n "`find data *.txt *.cfg -cnewer ../AndroidData/data.zip 2>&1`" ] && {
 echo "Archiving data"
 mkdir -p ../AndroidData
-zip -r data.zip data *.txt *.cfg >/dev/null
-mv -f data.zip ../AndroidData/
+zip -r ../AndroidData/data.zip data *.txt *.cfg >/dev/null
+}
 
 exit 0
diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src
index c2586fa2a..a4abb1f56 160000
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
@@ -1 +1 @@
-Subproject commit c2586fa2aa02d40b344d1de7c3d13b410de6b917
+Subproject commit a4abb1f56b9d9291278abcf544242ca75e4f009a