diff --git a/createSourceArchive.sh b/createSourceArchive.sh
index bc3817416..f7971c613 100755
--- a/createSourceArchive.sh
+++ b/createSourceArchive.sh
@@ -3,14 +3,18 @@
 APPNAME=`grep AppName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
 APPVER=`grep AppVersionName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
 
+ARCHIVER=gzip
+EXT=gz
+which xz > /dev/null && ARCHIVER="xz -z" && EXT=xz
+which pxz > /dev/null && ARCHIVER=pxz && EXT=xz
+
 # TODO: Boost, Python and ffmpeg are stored in repository as precompiled binaries, the proper way to fix that is to build them using scripts, and remove that binaries
 # --exclude="*.a" --exclude="*.so"
-tar -c -J --exclude-vcs --exclude="*.o" --exclude="*.d" --exclude="*.dep" \
--f $APPNAME-$APPVER-src.tar.xz \
+tar -c --exclude-vcs --exclude="*.o" --exclude="*.d" --exclude="*.dep" \
 `git ls-files --exclude-standard | grep -v '^project/jni/application/.*'` \
 `find  project/jni/application -maxdepth 1 -type f -o -type l` \
 project/jni/application/src \
 project/jni/application/`readlink project/jni/application/src` \
 project/AndroidManifest.xml project/src \
 project/obj/local/armeabi-v7a/*.so project/obj/local/x86/*.so \
-"$@"
+"$@" | $ARCHIVER > $APPNAME-$APPVER-src.tar.$EXT
diff --git a/todo.txt b/todo.txt
index 6fa270da1..ecb0648c5 100644
--- a/todo.txt
+++ b/todo.txt
@@ -21,6 +21,8 @@ TODO, which will get actually done
 
 - SDL: user-configurable option to set screen orientation.
 
+- OpenTTD: Scenario editor all menus are out of screen.
+
 - OpenTTD: 16bpp blitter with palette animation support.
 
 - OpenTTD: screen navigation buttons bug out OpentTD on Moto G.
@@ -31,7 +33,11 @@ TODO, which will get actually done
 
 - OpenTTD: stylus/finger hover does not highlight building area anymore.
 
-- OpenTTD: volume too loud and distorted.
+- OpenTTD: volume too loud and sound is distorted.
+
+- OpenTTD: Cheats menu closes itself randomly.
+
+- OpenTTD: Vechile replace screen "OK/replace" button is out of the screen.
 
 - Debian noroot: audio support.