diff --git a/project/jni/application/supertux/create-apk-with-data.sh b/project/jni/application/supertux/create-apk-with-data.sh
index 54b78452b..3382a3f56 100755
--- a/project/jni/application/supertux/create-apk-with-data.sh
+++ b/project/jni/application/supertux/create-apk-with-data.sh
@@ -8,10 +8,12 @@ PASS=
 [ -n "$ANDROID_KEYSTORE_PASS_FILE" ] && PASS="--ks-pass file:$ANDROID_KEYSTORE_PASS_FILE"
 
 OUT=`pwd`/../../../../SuperTux-with-data.apk
+DATAZIP=`pwd`/../../../../SuperTux-data.zip
 rm -f $OUT $OUT-aligned
-cp ../../../../project/app/build/outputs/apk/release/app-release.apk $OUT || exit 1
 cd supertux/data || exit 1
-zip -r -9 $OUT * || exit 1
-zipalign 4 $OUT $OUT-aligned || exit 1
+[ -e $DATAZIP ] || zip -r -9 $DATAZIP * || exit 1
+cp -f ../../../../../../project/app/build/outputs/apk/release/app-release.apk $OUT || exit 1
+zipmerge $OUT $DATAZIP
+zipalign -p 4 $OUT $OUT-aligned || exit 1
 mv $OUT-aligned $OUT
 apksigner sign --ks $ANDROID_KEYSTORE_FILE --ks-key-alias $ANDROID_KEYSTORE_ALIAS $PASS $OUT || exit 1
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 743e974fc..a38f0319c 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 743e974fcef5d10b0debf359c7b0960ecc2b6006
+Subproject commit a38f0319cd5ef48c86ed11fd4a26aeff2f413ad9
diff --git a/todo.txt b/todo.txt
index e41b4bbfc..908ccd882 100644
--- a/todo.txt
+++ b/todo.txt
@@ -39,7 +39,12 @@ TODO, which will get actually done
 
 - OpenLieroX: always dig while tapping Jump button, not just when in air.
 
-- SuperTux: update to new upstream version.
+- SuperTux: bring back jump helper.
 
-- SuperTux: right click does not work in editor.
+- SuperTux: worldmap is way laggy, bring back rect optimization.
 
+- SuperTux: Back button does not work.
+
+- SuperTux: World map resets progress after app restart.
+
+- SuperTux: Cannot save config file.