diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 1ddf627121..caffb2020f 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -38,6 +38,19 @@
                     android:targetPackage="org.retroarch" />
             </Preference>
         </PreferenceCategory>
+        <PreferenceCategory android:title="System">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom system folder. Cores will look for system specific files, like BIOSes, in this folder. If not enabled, it will look in the ROM folder."
+                android:key="system_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="System directory"
+                android:summary="Sets directory where system files are loaded from."
+                android:dependency="system_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.SystemDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceScreen android:title="System Settings" >
         <PreferenceCategory android:title="General" >
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 9c036c148c..7a47df00d0 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -410,6 +410,8 @@ public class RetroArch extends Activity implements
 				prefs.getString("savefile_directory", "") : "");
 		config.setString("savestate_directory", prefs.getBoolean("savestate_directory_enable", false) ?
 				prefs.getString("savestate_directory", "") : "");
+		config.setString("system_directory", prefs.getBoolean("system_directory_enable", false) ?
+				prefs.getString("system_directory", "") : "");
 		
 		config.setBoolean("video_font_enable", prefs.getBoolean("video_font_enable", true));
 		
diff --git a/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java b/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java
new file mode 100644
index 0000000000..1a2be43477
--- /dev/null
+++ b/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java
@@ -0,0 +1,12 @@
+package org.retroarch.browser;
+
+import android.os.Bundle;
+
+public class SystemDirActivity extends DirectoryActivity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.setPathSettingKey("system_directory");
+		super.setIsDirectoryTarget(true);
+		super.onCreate(savedInstanceState);
+	}
+}