diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 680bef7518..a358afb750 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -67,21 +67,16 @@
                 android:key="video_vsync"
                 android:summary="When set to enabled, prevents screen tearing."
                 android:title="VSync" />
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="video_sync_refreshrate_to_screen"
-                android:summary="Synchronize RetroArch's refresh rate to the screen's refresh rate (recommended - some screens have refresh rates below 59.95Hz and need this enabled to get good audio/video sync)."
-                android:title="Sync refreshrate to screen" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Synchronization">
             <EditTextPreference
                 android:key="video_refresh_rate"
-                android:summary="Force a specific refresh rate to be detected. Only use if auto-detection of refresh rate reports wrong refresh rate."
+                android:summary="Force a specific refresh rate to be detected. Only set manually if calibration reports wrong refresh rate."
                 android:title="Forced refresh rate (Hz)"
-                android:numeric="decimal"
-                android:dependency="video_sync_refreshrate_to_screen" />
+                android:numeric="decimal" />
             <Preference
                 android:summary="Attempts to find the true refresh rate of monitor. Updates value in 'Force refresh rate (Hz)' option. To help ensure accuracy, make sure no intense background services are running, and avoid triggering screensaver."
-                android:title="Calibrate refresh rate"
-                android:dependency="video_sync_refreshrate_to_screen" >
+                android:title="Calibrate refresh rate">
                 <intent
                     android:targetClass="org.retroarch.browser.DisplayRefreshRateTest"
                     android:targetPackage="org.retroarch" />
@@ -98,7 +93,7 @@
                 android:key="video_aspect_ratio"
                 android:summary="Aspect ratio to enforce."
                 android:title="Aspect ratio" />
-        </PreferenceCategory>
+		</PreferenceCategory>
         <PreferenceCategory android:title="Shaders (1st pass)" >
             <CheckBoxPreference
                 android:defaultValue="true"
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 96ea204a2b..de137fba09 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -66,9 +66,16 @@ public class RetroArch extends Activity implements
 	private ConfigFile core_config;
 	
 	private final double getDisplayRefreshRate() {
+		// Android is *very* likely to screw this up.
+		// It is rarely a good value to use, so make sure it's not
+		// completely wrong. Some phones return refresh rates that are completely bogus
+		// (like 0.3 Hz, etc), so try to be very conservative here.
 		final WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
 		final Display display = wm.getDefaultDisplay();
-		return display.getRefreshRate();
+		double rate = display.getRefreshRate();
+		if (rate > 61.0 || rate < 58.0)
+			rate = 59.95;
+		return rate;
 	}
 
 	private final double getRefreshRate() {
@@ -363,12 +370,7 @@ public class RetroArch extends Activity implements
 		config.setInt("input_autodetect_icade_profile_pad3", prefs.getInt("input_autodetect_icade_profile_pad3", 0));
 		config.setInt("input_autodetect_icade_profile_pad4", prefs.getInt("input_autodetect_icade_profile_pad4", 0));
 		
-		if (prefs.getBoolean("video_sync_refreshrate_to_screen", true)) {
-			config.setDouble("video_refresh_rate", getRefreshRate());
-		} else {
-			Log.i(TAG, "Refresh rate set to 59.95Hz (default).");
-			config.setDouble("video_refresh_rate", 59.95);
-		}
+		config.setDouble("video_refresh_rate", getRefreshRate());
 		
 		String aspect = prefs.getString("video_aspect_ratio", "auto");
 		if (aspect.equals("full")) {