diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 8db96b61b..f3862a8d8 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-24  Jens Granseuer  <jensgr@gmx.net>
+
+	The fix for bug #420154 not only made the entry for the theme installer
+	disappear from the menu, but also disabled mime-type handling for Gnome
+	Theme Packages (bug #486811). Revert that change and use NoDisplay=true
+	instead. This will remove the entry from the menu (not from the menu
+	editor, though), and not break mime handling.
+
+	* data/gnome-theme-installer.desktop.in.in: use NoDisplay=true instead
+	of OnlyShowIn=;
+
 2007-10-18  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-themes.c: (theme_load_from_gconf),
diff --git a/capplets/appearance/data/gnome-theme-installer.desktop.in.in b/capplets/appearance/data/gnome-theme-installer.desktop.in.in
index 292e4b857..e3ea2d35d 100644
--- a/capplets/appearance/data/gnome-theme-installer.desktop.in.in
+++ b/capplets/appearance/data/gnome-theme-installer.desktop.in.in
@@ -8,8 +8,7 @@ Type=Application
 MimeType=application/x-gnome-theme-package;
 StartupNotify=true
 Categories=GNOME;GTK;
-# we don't want to show this at all in the menus
-OnlyShowIn=;
+NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Appearance