diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index fee2e2777..c2a4564e9 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=19280
+AppVersionCode=19282
 
 # Application user-visible version name (string)
-AppVersionName="1.9.2.80"
+AppVersionName="1.9.2.82"
 
 # 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
diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh
index f41da2c12..04fa42cd6 100755
--- a/project/jni/application/openttd/build-pc.sh
+++ b/project/jni/application/openttd/build-pc.sh
@@ -18,9 +18,12 @@ cd bin
 export LD_LIBRARY_PATH=/usr/local/lib
 
 if [ -z "$1" ]; then
-	./openttd -d 0 -g opntitle.sav
+	./openttd -d 0 -m null -g opntitle.sav
+elif [ -n "$2" ]; then
+	valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \
+	./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 # -g opntitle.sav
+	./openttd -d 0 -m null -g opntitle.sav
 fi
diff --git a/project/jni/application/openttd/java.patch b/project/jni/application/openttd/java.patch
index 36461031f..a4319f455 100644
--- a/project/jni/application/openttd/java.patch
+++ b/project/jni/application/openttd/java.patch
@@ -1,20 +1,14 @@
 diff --git a/project/java/Settings.java b/project/java/Settings.java
-index 9e6150a41..77e84dce4 100644
+index 4467879a0..1de0689c2 100644
 --- a/project/java/Settings.java
 +++ b/project/java/Settings.java
-@@ -521,6 +521,15 @@ public class Settings
- 			for( String sdpath: SdcardAppPath.get().allPaths(p) )
- 				deleteRecursivelyAndLog(new File(sdpath + "/" + path ));
- 		}
-+		// Hack to save old config file, which is gettign corrupted on app update
-+		try {
-+			String cmd = "cp " + Globals.DataDir + "/.openttd/openttd.cfg " + Globals.DataDir + "/.openttd/openttd-backup.cfg";
-+			Log.i("SDL", "===============");
-+			Log.i("SDL", cmd);
-+			int ret = Runtime.getRuntime().exec(cmd).waitFor();
-+			Log.i("SDL", "Status: " + String.valueOf(ret));
-+			Log.i("SDL", "===============");
-+		} catch (Exception e) { }
- 	}
- 	public static void DeleteSdlConfigOnUpgradeAndRestart(final MainActivity p)
- 	{
+@@ -532,6 +532,9 @@ public class Settings
+ 		} catch ( IOException e ) { }
+ 		new File( p.getFilesDir() + "/" + SettingsFileName ).delete();
+ 
++		// Kill it with vengeance and unload all shared libraries
++		android.os.Process.killProcess(android.os.Process.myPid());
++
+ 		Intent intent = new Intent(p, RestartMainActivity.class);
+ 		p.startActivity(intent);
+ 		System.exit(0);
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 74a12d6f9..dd2c24947 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 74a12d6f9bd8df1fcf020cbb0a5967ae34333cfe
+Subproject commit dd2c249473d4491c36647478178c42a6ab048b8a