diff --git a/project/java/Settings.java b/project/java/Settings.java
index 98247cf4b..d72649e9d 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -441,6 +441,14 @@ class Settings
 					for( String s: fileList )
 						if( s.toUpperCase().startsWith(DataDownloader.DOWNLOAD_FLAG_FILENAME.toUpperCase()) )
 							Globals.DataDir = SdcardAppPath.getPath(p);
+
+				try {
+					new File(Globals.DataDir).mkdirs();
+					new FileOutputStream( new File(Globals.DataDir, ".nomedia") ).close();
+				} catch (Exception e) {
+					Globals.DownloadToSdcard = false; // SD card not writable
+					Globals.DataDir = p.getFilesDir().getAbsolutePath();
+				}
 			}
 		}
 
@@ -795,6 +803,14 @@ class Settings
 						continue;
 					StatFs stat = new StatFs(path.getPath());
 					long size = (long)stat.getAvailableBlocks() * stat.getBlockSize() / 1024 / 1024;
+
+					try {
+						path.mkdirs();
+						new FileOutputStream( new File(path, ".nomedia") ).close();
+					} catch (Exception e) {
+						size = -1; // Not writable
+					}
+
 					if( size > maxSize )
 					{
 						maxSize = size;
diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 66d5d82f2..f386c57e0 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -85,7 +85,7 @@ CompatibilityHacksTextInputEmulatesHwKeyboard=n
 # 1 - Simple QWERTY keyboard, no function keys, no arrow keys
 # 2 - Commodore 64 keyboard
 # 3 - Amiga keyboard
-TextInputKeyboard=1
+TextInputKeyboard=3
 
 # Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n)
 CompatibilityHacksPreventAudioChopping=n
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 954dd7b61..fb847eedd 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=16056
+AppVersionCode=16058
 
 # Application user-visible version name (string)
-AppVersionName="1.6.0.56"
+AppVersionName="1.6.0.58"
 
 # 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/src b/project/jni/application/openttd/src
index d408d58b5..2aee7d406 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit d408d58b572f4e1e95dd7bd9200eb943183e1c8e
+Subproject commit 2aee7d406cc36e4a7893b474330a359eb58c180e