diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 934a8d1f7..1c753fbc9 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 
 # Application version code (integer)
-AppVersionCode=16054
+AppVersionCode=16055
 
 # Application user-visible version name (string)
-AppVersionName="1.6.0.54"
+AppVersionName="1.6.0.55"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -18,7 +18,7 @@ AppVersionName="1.6.0.54"
 # 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 - 20 Mb|openttd-data-1.6.0-5.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download"
+AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.6.0-6.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh
index 14b490a3d..3b66c5db0 100755
--- a/project/jni/application/openttd/build-pc.sh
+++ b/project/jni/application/openttd/build-pc.sh
@@ -5,7 +5,8 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 mkdir -p openttd-pc openttd-pc/baseset
 cd openttd-pc
-[ -e bin/baseset ] || cp -a ../src/bin .
+[ -e bin/baseset ] || cp -a ../src/bin ./
+[ -e bin/fonts ] || cp -a ../data/fonts bin/
 
 export CFLAGS=-O0
 export CXXFLAGS=-O0
diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh
index 480d438d9..f9eebce0f 100755
--- a/project/jni/application/openttd/pack-data.sh
+++ b/project/jni/application/openttd/pack-data.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VER=1.6.0-5
+VER=1.6.0-6
 
 cd data
 rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 1f4570c14..481cecf6a 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 1f4570c14b08ab354bdffd5c34e36d66b5c1292f
+Subproject commit 481cecf6aa6802ddcc77fc3361d5467de9fcf0c7
diff --git a/project/jni/application/openttd/unpack-data.sh b/project/jni/application/openttd/unpack-data.sh
new file mode 100755
index 000000000..8bf63b0df
--- /dev/null
+++ b/project/jni/application/openttd/unpack-data.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+ls openttd-data-*.zip.xz || cp AndroidData/openttd-data-*.zip.xz ./
+
+for f in openttd-data-*.zip.xz; do
+	xz -d $f
+done
+
+for f in openttd-data-*.zip; do
+	rm -rf data
+	mkdir data
+	cd data
+	unzip ../$f
+	cd ..
+done
+