diff --git a/android/andretro/assets/libretro_pcsx_rearmed.so.xml b/android/andretro/assets/libretro_pcsx_rearmed.so.xml
new file mode 100644
index 0000000000..066637c815
--- /dev/null
+++ b/android/andretro/assets/libretro_pcsx_rearmed.so.xml
@@ -0,0 +1,24 @@
+<retro>
+    <system fullname="PlayStation1 (PCSX ReARMed)" shortname="PS1"/>
+    <module libraryname="PCSX ReARMed" extensions="bin|cue|img|mdf|pbp|cbn|toc"/>
+
+    <input>
+        <port shortname="p1" fullname="Player 1" defaultdevice="pad">
+            <device shortname="pad" fullname="Gamepad">
+                <button shortname="up" fullname="Up" mappedkey="UP"/>
+                <button shortname="down" fullname="Down" mappedkey="DOWN"/>
+                <button shortname="left" fullname="Left" mappedkey="LEFT"/>
+                <button shortname="right" fullname="Right" mappedkey="RIGHT"/>
+                <button shortname="select" fullname="Select" mappedkey="SELECT"/>
+                <button shortname="start" fullname="Start" mappedkey="START"/>
+                <button shortname="b" fullname="B" mappedkey="B"/>
+                <button shortname="a" fullname="A" mappedkey="A"/>
+                <button shortname="x" fullname="X" mappedkey="X"/>
+                <button shortname="y" fullname="Y" mappedkey="Y"/>
+                <button shortname="l" fullname="L" mappedkey="L1"/>
+                <button shortname="r" fullname="R" mappedkey="R1"/>
+            </device>
+        </port>
+    </input>
+    
+</retro>
diff --git a/android/andretro/src/org/andretro/browser/DirectoryActivity.java b/android/andretro/src/org/andretro/browser/DirectoryActivity.java
index 16e5b07de8..f8b8fc90cf 100644
--- a/android/andretro/src/org/andretro/browser/DirectoryActivity.java
+++ b/android/andretro/src/org/andretro/browser/DirectoryActivity.java
@@ -127,7 +127,7 @@ public class DirectoryActivity extends Activity implements AdapterView.OnItemCli
     	{
     		startActivity(new Intent(this, DirectoryActivity.class)
     				.putExtra("inRoot", true)
-    				.putExtra("path", Environment.getExternalStorageDirectory().getPath())
+    				.putExtra("path", "/mnt/")
     				.putExtra("moduleName", moduleName));
     		return true;
     	}