diff --git a/build.sh b/build.sh
index 70c77d696..7e230e81d 100755
--- a/build.sh
+++ b/build.sh
@@ -182,6 +182,11 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU nice -n19 ndk-build -j
 				ln -s -f libs lib ; \
 				zip -u -r bin/MainActivity-release-unsigned.apk lib assets || exit 1 ; \
 			} || ant release || exit 1 ; \
+			[ '!' -x jni/application/src/AndroidPostBuild.sh ] || {
+				cd jni/application/src ; \
+				./AndroidPostBuild.sh `pwd`/../../../bin/MainActivity-release-unsigned.apk || exit 1 ; \
+				cd ../../.. ; \
+			} || exit 1 ; \
 			jarsigner -tsa http://timestamp.digicert.com -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 bin/MainActivity-release-unsigned.apk androiddebugkey || exit 1 ; \
 			rm -f bin/MainActivity-debug.apk ; \
 			zipalign 4 bin/MainActivity-release-unsigned.apk bin/MainActivity-debug.apk || exit 1 ; \
diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index a49b6a645..0b5c15d07 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -18,7 +18,7 @@ AppVersionName="0.4.0.10"
 # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
 # these files are put inside .apk package by build system
 # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file
-AppDataDownloadUrl="!Data files|:data.zip:obb:main.4008|:data.zip:http://sourceforge.net/projects/libsdl-android/files/SuperTux/data-5.zip^!SSL certificates|:ca-certificates.crt:ca-certificates.crt"
+AppDataDownloadUrl="!SSL certificates|:ca-certificates.crt:ca-certificates.crt"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/supertux/AndroidPostBuild.sh b/project/jni/application/supertux/AndroidPostBuild.sh
new file mode 100755
index 000000000..09b028e84
--- /dev/null
+++ b/project/jni/application/supertux/AndroidPostBuild.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd supertux/data || exit 1
+zip -r -n .png:.ogg:.jpg $1 * || exit 1
diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio
index 37ce31ed3..f04d54127 160000
--- a/project/jni/application/xserver/pulseaudio
+++ b/project/jni/application/xserver/pulseaudio
@@ -1 +1 @@
-Subproject commit 37ce31ed32cf34fcb2f2fdbda40b6f24a9dd3424
+Subproject commit f04d541277106e3310e4da6f84ebf4a8d2cb54ef