diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index cc176dce99..ef48e3bc4e 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -890,7 +890,7 @@ else
 		ln -s -f $SDK_DIR/extras/android/compatibility/v4/android-support-v4.jar project/libs
 	}
 	[ -e $SDK_DIR/extras/google/google_play_services/libproject/google-play-services_lib/build.xml ] || \
-		android update project -p $SDK_DIR/extras/google/google_play_services/libproject/google-play-services_lib
+		android update project -t android-22 -p $SDK_DIR/extras/google/google_play_services/libproject/google-play-services_lib
 fi
 
 if [ -e project/jni/application/src/project.patch ]; then patch -p1 --no-backup-if-mismatch < project/jni/application/src/project.patch || exit 1 ; fi
diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src
index f619f28882..c75d32327a 160000
--- a/project/jni/application/hid-pc-keyboard/src
+++ b/project/jni/application/hid-pc-keyboard/src
@@ -1 +1 @@
-Subproject commit f619f288821fc36f05b01811236349da9aef52d4
+Subproject commit c75d32327a191394e6f05975881f21eb013bc32b
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 6068b352ec..b7f84c09e1 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=15037
+AppVersionCode=15039
 
 # Application user-visible version name (string)
-AppVersionName="1.5.0.37"
+AppVersionName="1.5.0.39"
 
 # 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
@@ -24,7 +24,7 @@ AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.5.0.zip.xz|http://source
 ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade="baseset ai game lang"
+DeleteFilesOnUpgrade="baseset ai game lang libsdl-DownloadFinished-0.flag"
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # 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/
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index c03272c1ab..d400d979e6 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit c03272c1ab1a685baf581aa8c966501d4f8299b3
+Subproject commit d400d979e607a2255d9f8e47f4ae876d7f48d1c4