diff --git a/ChangeLog b/ChangeLog
index 98c32d53f..c304e5450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-28  Thomas Thurman  <tthurman@gnome.org>
+
+        * src/core/prefs.c (handle_preference_update_string,
+        meta_prefs_remove_listener, queue_changed): Make disabling
+        gconf work again.  Closes #530870.
+
 2008-05-26  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: Post-release bump to 2.23.34.
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 7a1473f9e..025d24605 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -689,10 +689,6 @@ handle_preference_update_string (const gchar *key, GConfValue *value)
   return TRUE;
 }
 
-#endif /* HAVE_GCONF */
-
-/* FIXME: Ultimately these should be no-ops if !HAVE_GCONF. */
-
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
                          gpointer             data)
@@ -732,7 +728,6 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
   meta_bug ("Did not find listener to remove\n");
 }
 
-#ifdef HAVE_GCONF
 static void
 emit_changed (MetaPreference pref)
 {
@@ -803,8 +798,26 @@ queue_changed (MetaPreference pref)
     changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY,
                                     changed_idle_handler, NULL, NULL);
 }
+
+#else /* HAVE_GCONF */
+
+void
+meta_prefs_add_listener (MetaPrefsChangedFunc func,
+                         gpointer             data)
+{
+  /* Nothing, because they have gconf turned off */
+}
+
+void
+meta_prefs_remove_listener (MetaPrefsChangedFunc func,
+                            gpointer             data)
+{
+  /* Nothing, because they have gconf turned off */
+}
+
 #endif /* HAVE_GCONF */
 
+
 static gchar *gconf_dirs_we_are_interested_in[] = {
   "/apps/metacity",
   KEY_TERMINAL_DIR,