diff --git a/build.sh b/build.sh
index 1bc762ce3..bc9e13781 100755
--- a/build.sh
+++ b/build.sh
@@ -176,8 +176,13 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU ndk-build -j$NCPU V=1
 		fi ; } && \
 	{	if $sign_apk; then cd .. && ./sign.sh && cd project ; else true ; fi ; } && \
 	{	$install_apk && [ -n "`adb devices | tail -n +2`" ] && \
-		{	adb install -r app/build/outputs/apk/release/app-release.apk | grep 'Failure' && \
-			adb uninstall `grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r app/build/outputs/apk/release/app-release.apk ; } ; \
+		{	if $sign_apk; then \
+				APPNAME=`grep AppName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` ; \
+				APPVER=`grep AppVersionName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` ; \
+				adb install -r ../$APPNAME-$APPVER.apk ; \
+			else \
+				adb install -r app/build/outputs/apk/release/app-release.apk ; \
+			fi ; } ; \
 		true ; } && \
 	{	$run_apk && { \
 			ActivityName="`grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'`/.MainActivity" ; \
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 6966b2307..cf0760bcd 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=110186
+AppVersionCode=110187
 
 # Application user-visible version name (string)
-AppVersionName="1.10.1.86"
+AppVersionName="1.10.1.87"
 
 # 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
@@ -270,6 +270,7 @@ APP_PLATFORM=
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a arm64-v8a x86 x86_64
 MultiABI='arm64-v8a armeabi-v7a x86 x86_64'
+#MultiABI=arm64-v8a
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 patents are expired, but libmad license is GPL, not LGPL
diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh
index d5a3c21b9..2de11ccc2 100755
--- a/project/jni/application/openttd/build-pc.sh
+++ b/project/jni/application/openttd/build-pc.sh
@@ -15,10 +15,8 @@ export CXXFLAGS=-O0
 make -j8 VERBOSE=1 || exit 1
 cd bin
 
-export LD_LIBRARY_PATH=/usr/local/lib
-
 if [ -z "$1" ]; then
-	./openttd -d 0 -m null -g opntitle.sav -r 854x480
+	./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
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 7b72277db..c1d279db9 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 7b72277dbee58d44fe77df5fe7444a9350027a2c
+Subproject commit c1d279db96646ac09103aa373fee02ea7d173810
diff --git a/signBundle.sh b/signBundle.sh
index 6ba0f336d..4f4e7e90c 100755
--- a/signBundle.sh
+++ b/signBundle.sh
@@ -7,16 +7,19 @@ PASS=
 APPNAME=`grep AppName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
 APPVER=`grep AppVersionName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
 
+# Fix Gradle compilation error
+[ -z "$ANDROID_NDK_HOME" ] && export ANDROID_NDK_HOME="`which ndk-build | sed 's@/ndk-build@@'`"
+
 cd project
 
 ./gradlew bundleRelease || exit 1
 
-../copyAssets.sh pack-binaries-bundle app/build/outputs/bundle/release/app.aab
+../copyAssets.sh pack-binaries-bundle app/build/outputs/bundle/release/app-release.aab
 
 cd app/build/outputs/bundle/release || exit 1
 
 # Remove old certificate
-cp -f app.aab ../../../../../../$APPNAME-$APPVER.aab || exit 1
+cp -f app-release.aab ../../../../../../$APPNAME-$APPVER.aab || exit 1
 # Sign with the new certificate
 echo Using keystore $ANDROID_UPLOAD_KEYSTORE_FILE and alias $ANDROID_UPLOAD_KEYSTORE_ALIAS
 stty -echo