diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index a96f7399dc..515bf3ef27 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -22,6 +22,7 @@
         </activity>
         
         <activity android:name="org.retroarch.browser.DisplayRefreshRateTest"></activity>
+        <activity android:name="org.retroarch.browser.RefreshRateSetOS"></activity>
         <activity android:name="org.retroarch.browser.SettingsActivity"></activity>
         <activity android:name="org.retroarch.browser.HelpActivity"></activity>
         <activity android:name="org.retroarch.browser.DirectoryActivity"></activity>
diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index c6923139b4..605c4cbccf 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -94,6 +94,13 @@
                     android:targetClass="org.retroarch.browser.DisplayRefreshRateTest"
                     android:targetPackage="org.retroarch" />
             </Preference>
+            <Preference
+                android:summary="Sets refresh rate equal to OS-reported value. This might not be accurate for your phone."
+                android:title="Set OS-reported refresh rate" >
+                <intent
+                    android:targetClass="org.retroarch.browser.RefreshRateSetOS"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
         </PreferenceCategory>
         <PreferenceCategory android:title="Shaders (1st pass)" >
             <CheckBoxPreference
diff --git a/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java b/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
index e0f6b6410d..799260dcd5 100644
--- a/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
+++ b/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
@@ -120,7 +120,7 @@ public class DisplayRefreshRateTest extends Activity {
 	protected void onDestroy() {
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
 		String fps = prefs.getString("video_refresh_rate", "ERROR");
-		Toast.makeText(this, "Refresh Rate: " + fps, Toast.LENGTH_LONG).show();
+		Toast.makeText(this, "Refresh rate measured to: " + fps + " Hz.", Toast.LENGTH_LONG).show();
 		super.onDestroy();
 	}
 }
diff --git a/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java b/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
new file mode 100644
index 0000000000..b9479c80eb
--- /dev/null
+++ b/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
@@ -0,0 +1,29 @@
+package org.retroarch.browser;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.view.Display;
+import android.view.WindowManager;
+import android.widget.Toast;
+
+public class RefreshRateSetOS extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		final WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+		final Display display = wm.getDefaultDisplay();
+		double rate = display.getRefreshRate();
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+		SharedPreferences.Editor edit = prefs.edit();
+		edit.putString("video_refresh_rate", Double.valueOf(rate).toString());
+		edit.commit();
+		
+		Toast.makeText(this, "Using OS-reported refresh rate of: " + rate + " Hz.", Toast.LENGTH_LONG).show();
+		finish();
+	}
+}