diff --git a/res/values/strings.xml b/res/values/strings.xml
index b88ee87a5..fa2d91bf2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -120,7 +120,8 @@
 	<string name="display">Display</string>
 
 	<string name="expert">Expert</string>
-	<string name="expert_mode">Enable expert mode</string>
+	<string name="expert_on">Show extra info and enable extra settings</string>
+	<string name="expert_off">Hide extras for experienced users</string>
 
 	<string name="search_hint">Search applications</string>
 
diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java
index c8f4a4d11..563aac289 100644
--- a/src/org/fdroid/fdroid/Preferences.java
+++ b/src/org/fdroid/fdroid/Preferences.java
@@ -36,6 +36,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
     public static final String PREF_COMPACT_LAYOUT = "compactlayout";
     public static final String PREF_IGN_TOUCH = "ignoreTouchscreen";
     public static final String PREF_CACHE_APK = "cacheDownloaded";
+    public static final String PREF_EXPERT = "expert";
     public static final String PREF_DB_SYNC = "dbSyncMode";
 
     private static final boolean DEFAULT_COMPACT_LAYOUT = false;
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index 8de339e33..d0972cb67 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -42,17 +42,19 @@ public class PreferencesActivity extends PreferenceActivity implements
     private int result = 0;
 
     private static String[] summariesToUpdate = {
-                    Preferences.PREF_UPD_INTERVAL,
-                    Preferences.PREF_UPD_WIFI_ONLY,
-                    Preferences.PREF_UPD_HISTORY,
-                    Preferences.PREF_ROOTED,
-                    Preferences.PREF_INCOMP_VER,
-                    Preferences.PREF_THEME,
-                    Preferences.PREF_PERMISSIONS,
-                    Preferences.PREF_COMPACT_LAYOUT,
-                    Preferences.PREF_IGN_TOUCH,
-                    Preferences.PREF_DB_SYNC,
-                    Preferences.PREF_CACHE_APK };
+        Preferences.PREF_UPD_INTERVAL,
+        Preferences.PREF_UPD_WIFI_ONLY,
+        Preferences.PREF_UPD_HISTORY,
+        Preferences.PREF_ROOTED,
+        Preferences.PREF_INCOMP_VER,
+        Preferences.PREF_THEME,
+        Preferences.PREF_PERMISSIONS,
+        Preferences.PREF_COMPACT_LAYOUT,
+        Preferences.PREF_IGN_TOUCH,
+        Preferences.PREF_CACHE_APK,
+        Preferences.PREF_EXPERT,
+        Preferences.PREF_DB_SYNC
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -177,6 +179,17 @@ public class PreferencesActivity extends PreferenceActivity implements
             return;
         }
 
+        if (key.equals(Preferences.PREF_EXPERT)) {
+            CheckBoxPreference pref = (CheckBoxPreference)findPreference(
+                    Preferences.PREF_EXPERT);
+            if (pref.isChecked()) {
+                pref.setSummary(R.string.expert_on);
+            } else {
+                pref.setSummary(R.string.expert_off);
+            }
+            return;
+        }
+
         if (key.equals(Preferences.PREF_DB_SYNC)) {
             ListPreference pref = (ListPreference)findPreference(
                     Preferences.PREF_DB_SYNC);