diff --git a/project/java/Settings.java b/project/java/Settings.java
index 69deb7a4d..8863745b7 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -617,6 +617,12 @@ class Settings
 		SdcardAppPath.setEnv(p);
 		nativeSetEnv( "HOME", Globals.DataDir );
 		nativeSetEnv( "SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath() );
+		nativeSetEnv( "SDCARD_DOWNLOADS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() );
+		nativeSetEnv( "SDCARD_PICTURES", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() );
+		nativeSetEnv( "SDCARD_MOVIES", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath() );
+		nativeSetEnv( "SDCARD_DCIM", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() );
+		nativeSetEnv( "SDCARD_MUSIC", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath() );
+		nativeSetEnv( "SDCARD_MUSIC", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath() );
 		nativeSetEnv( "ANDROID_VERSION", String.valueOf(android.os.Build.VERSION.SDK_INT) );
 		nativeSetEnv( "ANDROID_PACKAGE_NAME", p.getPackageName() );
 		nativeSetEnv( "ANDROID_MY_OWN_APP_FILE", p.getPackageResourcePath() );
diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice
index 48b64fc4a..0b817c357 160000
--- a/project/jni/application/vice/vice
+++ b/project/jni/application/vice/vice
@@ -1 +1 @@
-Subproject commit 48b64fc4a82fa4a1afec3cadbe38536033e0511c
+Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c