diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg
index 6dca3fc16..31206e874 100644
--- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="OpenTTD JGR"
 AppFullName=org.openttd.jgrpp
 
 # Application version code (integer)
-AppVersionCode=039211
+AppVersionCode=040211
 
 # Application user-visible version name (string)
-AppVersionName="0.39.2"
+AppVersionName="0.40.2"
 
 # 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, '!!' will also hide the entry from the menu, so it cannot be disabled
@@ -20,7 +20,7 @@ AppVersionName="0.39.2"
 # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file
 # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries
 # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip
-AppDataDownloadUrl="!!Data files|openttd-data-0.39.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz"
+AppDataDownloadUrl="!!Data files|openttd-data-0.40.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y
diff --git a/project/jni/application/openttd-jgrpp/AndroidBuild.sh b/project/jni/application/openttd-jgrpp/AndroidBuild.sh
index f8636cfda..51aa1cec2 100755
--- a/project/jni/application/openttd-jgrpp/AndroidBuild.sh
+++ b/project/jni/application/openttd-jgrpp/AndroidBuild.sh
@@ -49,6 +49,9 @@ export ARCH=$1
 				# Hack for FREETYPE_INCLUDE_DIRS
 				echo "set(${TARGET}_INCLUDE_DIRS $LOCAL_PATH/../../$LIB/include)" >> $CMAKE_SDL
 				;;
+			fontconfig)
+				TARGET=Fontconfig
+				;;
 			icui18n|iculx|icuuc|icudata|icule|icuio)
 				TARGET="ICU_`echo $LIB | sed 's/icu//'`"
 				echo "set(PC_${TARGET}_INCLUDE_DIRS $LOCAL_PATH/../../$LIB/include)" >> $CMAKE_SDL
@@ -83,6 +86,8 @@ export ARCH=$1
 		-DANDROID_NATIVE_API_LEVEL=$APILEVEL \
 		-DANDROID_STL=c++_shared \
 		-DGLOBAL_DIR="." \
+		-DHOST_BINARY_DIR=$LOCAL_PATH/build-tools \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-B openttd-$VER-$1 src
 
 } || exit 1
@@ -90,5 +95,5 @@ export ARCH=$1
 NCPU=8
 uname -s | grep -i "linux" > /dev/null && NCPU=`cat /proc/cpuinfo | grep -c -i processor`
 
-make -C openttd-$VER-$1 -j$NCPU VERBOSE=1 STRIP='' && cp -f openttd-$VER-$1/libopenttd.so libapplication-$1.so || exit 1
+make -C openttd-$VER-$1 -j$NCPU VERBOSE=1 STRIP='' && cp -f openttd-$VER-$1/libapplication.so libapplication-$1.so || exit 1
 
diff --git a/project/jni/application/openttd-jgrpp/AndroidPreBuild.sh b/project/jni/application/openttd-jgrpp/AndroidPreBuild.sh
new file mode 100755
index 000000000..3dcf1c3bd
--- /dev/null
+++ b/project/jni/application/openttd-jgrpp/AndroidPreBuild.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mkdir -p build-tools
+[ -e build-tools/Makefile ] || cmake -DOPTION_TOOLS_ONLY=ON -B build-tools src
+make -C build-tools -j8 VERBOSE=1 || exit 1
diff --git a/project/jni/application/openttd-jgrpp/build-pc.sh b/project/jni/application/openttd-jgrpp/build-pc.sh
index 095744ab5..97fe39ca4 100755
--- a/project/jni/application/openttd-jgrpp/build-pc.sh
+++ b/project/jni/application/openttd-jgrpp/build-pc.sh
@@ -7,25 +7,22 @@ mkdir -p openttd-pc openttd-pc/baseset
 cd openttd-pc
 [ -e bin/baseset ] || cp -a ../src/bin ./
 [ -e bin/fonts ] || cp -a ../data/fonts bin/
-mkdir -p src
-ln -sf ../../src/src/stdafx.h src/
 
 export CFLAGS=-O0
 export CXXFLAGS=-O0
 
-[ -e Makefile ] || ../src/configure --enable-debug --with-fluidsynth || exit 1
+[ -e Makefile ] || cmake ../src || exit 1
 make -j8 VERBOSE=1 || exit 1
 cd bin
-
-export LD_LIBRARY_PATH=/usr/local/lib
+cp -f ../baseset/opntitle.dat opntitle.sav
 
 if [ -z "$1" ]; then
-	./openttd -d 0 -g opntitle.sav
+	../openttd -d 2 -m null -g opntitle.sav -r 854x480
 elif [ -n "$2" ]; then
 	valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \
-	./openttd -d 0 -m null # -g opntitle.sav
+	../openttd -d 0 -m null # -g opntitle.sav
 else
 	#valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \
 	gdb -ex run --args \
-	./openttd -d 0 -m null -g opntitle.sav
+	../openttd -d 0 -m null -g opntitle.sav -r 854x480
 fi
diff --git a/project/jni/application/openttd-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh
index 769946291..f1b8bf6dc 100755
--- a/project/jni/application/openttd-jgrpp/pack-data.sh
+++ b/project/jni/application/openttd-jgrpp/pack-data.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VER=0.39.2-0
+VER=0.40.2-0
 
 cd data
 rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip
diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src
index 439ecdde9..afae8ea43 160000
--- a/project/jni/application/openttd-jgrpp/src
+++ b/project/jni/application/openttd-jgrpp/src
@@ -1 +1 @@
-Subproject commit 439ecdde92895a39e5e89b2092f98273e2894866
+Subproject commit afae8ea434f5028751c0a35ea842274a2b4109c4
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 042e98258..da2947e5e 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 042e98258792c472639ffcf91f3a2519e0679373
+Subproject commit da2947e5e32b292e5f6826be59f2ecdf4ead08fe