diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 7a390fd93..5b7181c19 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -196,7 +196,7 @@ echo "# Here you may type readme text, which will be shown during startup. Forma
 echo "# Text in English, use \\\\\\\\\\\\\\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/" >> AndroidAppSettings.cfg
 echo ReadmeText=\'$ReadmeText\' | sed 's/\\\\n/\\\\\\\\n/g' >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
-echo "# libSDL version to use (1.2/1.3/2.0)" >> AndroidAppSettings.cfg
+echo "# libSDL version to use (1.2/2.0)" >> AndroidAppSettings.cfg
 echo LibSdlVersion=$LibSdlVersion >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
 echo "# Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape" >> AndroidAppSettings.cfg
diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index 349b792d8..f9d97d7ae 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -309,10 +309,10 @@ AppLdflags='-frtti -fexceptions -Oz'
 AppOverlapsSystemHeaders=n
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src'
+AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src supertux/external/partio_zip supertux/external/SDL_SavePNG'
 
 # Exclude these files from build
-AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl'
+AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl supertux/external/SDL_SavePNG/main.c'
 
 # Application command line parameters, including app name as 0-th param
 AppCmdline='./supertux2'
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 1c4809099..615b22bde 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 1c4809099588ce1f6b0e705878dfef2e3445b6ff
+Subproject commit 615b22bde33436fe4c821d374f3e9b9da2cf9de5