diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh
index 0f6c8dcab..d929b9b36 100755
--- a/ChangeAppSettings.sh
+++ b/ChangeAppSettings.sh
@@ -923,17 +923,14 @@ mkdir -p project/assets
 rm -f project/assets/*
 if [ -d "project/jni/application/src/AndroidData" ] ; then
 	echo Copying asset files
-	for F in project/jni/application/src/AndroidData/*; do
-		if [ `cat $F | wc -c` -gt 1048576 ] ; then
-			echo "Error: the file $F is bigger than 1048576 bytes - some Android devices will fail to extract such file"
-			echo "Please use HTTP download method, or split your data into several small files with command:"
-			echo "split -b 1000000 -d data.zip data.zip"
-			echo "It will create files data.zip00, data.zip01 etc, and SDL will try to search for such files in assets when unpacking data.zip"
-			exit 1
-		fi
-	done
 	cp project/jni/application/src/AndroidData/* project/assets/
 	ln -s ../libs/armeabi/stdout-test project/assets/
+	for F in project/assets/*; do
+		if [ `cat $F | wc -c` -gt 1000000 ] ; then
+			echo "The file $F is bigger than 1 megabyte - splitting it into smaller chunks"
+			split -b 1000000 -d $F $F && rm $F || { echo "Error: 'split' command not installed" ; exit 1 ; }
+		fi
+	done
 fi
 
 echo Done
diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg
index 1415399f0..478ab6804 100644
--- a/project/jni/application/openarena/AndroidAppSettings.cfg
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -20,8 +20,8 @@ AppUsesMouse=y
 AppNeedsTwoButtonMouse=n
 ShowMouseCursor=n
 ForceRelativeMouseMode=n
-AppNeedsArrowKeys=n
-AppNeedsTextInput=n
+AppNeedsArrowKeys=y
+AppNeedsTextInput=y
 AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=y
@@ -34,11 +34,11 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=101
-AppVersionName="1.01"
+AppVersionCode=08801
+AppVersionName="0.8.8.01"
 ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade="%"
-CompiledLibraries="sdl_mixer sdl_image freetype curl"
+CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
 CustomBuildScript=y
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index 194e33201..a5d435e78 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -5,7 +5,7 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 ../setEnvironment.sh make -j8 -C engine \
 PLATFORM=android ARCH=arm USE_GLES=1 USE_LOCAL_HEADERS=0 \
-USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=0 USE_MUMBLE=0 USE_FREETYPE=1 \
-USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 HAVE_VM_COMPILED=1 &&
+USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=1 USE_MUMBLE=0 USE_FREETYPE=1 \
+USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 &&
 mv -f engine/build/release-android-arm/openarena.arm libapplication.so
 
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 7e290b68a..cea3164ad 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 7e290b68a545d9ae99daaaf0aaa173584a6ebe89
+Subproject commit cea3164adfe13c53b3849985a1b29780efe5cef3
diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index b99cb96f4..21e6e5df3 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -5,7 +5,7 @@ AppName="TeeWorlds"
 AppFullName=com.teeworlds
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Game data is 8 Mb|http://sourceforge.net/projects/libsdl-android/files/TeeWorlds/teeworlds.zip/download"
+AppDataDownloadUrl="Game data|teeworlds.zip"
 VideoDepthBpp=16
 NeedDepthBuffer=n
 NeedStencilBuffer=n
@@ -14,6 +14,8 @@ SwVideoMode=n
 SdlVideoResize=n
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
@@ -29,12 +31,13 @@ AppTouchscreenKeyboardKeysAmount=6
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SPACE RETURN LEFT RIGHT RSHIFT LSHIFT"
 StartupMenuButtonTimeout=3000
-HiddenMenuOptions=''
+HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=y
 AppVersionCode=5207
 AppVersionName="0.5.2.07"
 ResetSdlConfigForThisVersion=n
+DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_image freetype"
 CustomBuildScript=n
 AppCflags='-O3'
diff --git a/project/jni/application/teeworlds/AndroidData/teeworlds.zip b/project/jni/application/teeworlds/AndroidData/teeworlds.zip
new file mode 100644
index 000000000..e5480c23d
Binary files /dev/null and b/project/jni/application/teeworlds/AndroidData/teeworlds.zip differ
diff --git a/project/jni/application/teeworlds/src/game/server/entity.hpp b/project/jni/application/teeworlds/src/game/server/entity.hpp
index debe57b6a..6bdb25dee 100644
--- a/project/jni/application/teeworlds/src/game/server/entity.hpp
+++ b/project/jni/application/teeworlds/src/game/server/entity.hpp
@@ -2,6 +2,7 @@
 #define GAME_SERVER_ENTITY_H
 
 #include <new>
+#include <cstddef>
 #include <base/vmath.hpp>
 
 #define MACRO_ALLOC_HEAP() \