diff --git a/gdm-metacity.patch b/gdm-metacity.patch
deleted file mode 100644
index 291d3e7..0000000
--- a/gdm-metacity.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: data/greeter-autostart/Makefile.am
-===================================================================
---- data/greeter-autostart/Makefile.am	(revision 6433)
-+++ data/greeter-autostart/Makefile.am	(working copy)
-@@ -19,6 +19,7 @@
- 	gnome-power-manager.desktop.in		\
- 	gnome-settings-daemon.desktop.in	\
- 	gok.desktop.in				\
-+	metacity.desktop.in			\
- 	orca-screen-reader.desktop.in		\
- 	$(NULL)
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-Index: data/greeter-autostart/metacity.desktop.in
-===================================================================
---- data/greeter-autostart/metacity.desktop.in	(revision 0)
-+++ data/greeter-autostart/metacity.desktop.in	(revision 0)
-@@ -0,0 +1,20 @@
-+[Desktop Entry]
-+Type=Application
-+Encoding=UTF-8
-+_Name=Metacity
-+Exec=metacity
-+# name of loadable control center module
-+X-GNOME-WMSettingsModule=metacity
-+# name we put on the WM spec check window
-+X-GNOME-WMName=Metacity
-+# back compat only 
-+X-GnomeWMSettingsLibrary=metacity
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=metacity
-+X-GNOME-Bugzilla-Component=general
-+X-GNOME-Autostart-Phase=WindowManager
-+X-GNOME-Provides=windowmanager
-+X-GNOME-Autostart-Notify=true
-+
-+[Window Manager]
-+SessionManaged=true
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in	(revision 6433)
-+++ po/POTFILES.in	(working copy)
-@@ -56,6 +56,7 @@
- data/greeter-autostart/gnome-settings-daemon.desktop.in.in
- data/greeter-autostart/gnome-mag.desktop.in
- data/greeter-autostart/gok.desktop.in
-+data/greeter-autostart/metacity.desktop.in
- data/greeter-autostart/orca-screen-reader.desktop.in
- gui/simple-chooser/gdm-host-chooser-dialog.c
- gui/simple-chooser/gdm-host-chooser-widget.c
-Index: po/ChangeLog
-===================================================================
---- po/ChangeLog	(revision 6433)
-+++ po/ChangeLog	(working copy)
-@@ -1,3 +1,7 @@
-+2008-08-25  William Jon McCann  <jmccann@redhat.com>
-+
-+	* POTFILES.in: Update list
-+
- 2008-08-25  Tomasz Dominikowski  <tdominikowski@aviary.pl>
- 
- 	* pl.po: Updated Polish translation
diff --git a/gdm-user-switcher-no-help.patch b/gdm-user-switcher-no-help.patch
new file mode 100644
index 0000000..74a637d
--- /dev/null
+++ b/gdm-user-switcher-no-help.patch
@@ -0,0 +1,16 @@
+diff -up gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.no-help gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
+--- gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.no-help	2008-10-03 00:33:07.000000000 -0400
++++ gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml	2008-10-03 00:33:37.000000000 -0400
+@@ -12,12 +12,6 @@
+       <separator
+        name="GdmSeparator"/>
+       <menuitem
+-       name="Help Item"
+-       verb="GdmHelp"
+-       _label="_Help"
+-       pixtype="stock"
+-       pixname="gtk-help"/>
+-      <menuitem
+        name="About Item"
+        verb="GdmAbout"
+        _label="_About"
diff --git a/gdm.spec b/gdm.spec
index 5988292..1b1da16 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -97,6 +97,9 @@ Patch10: gdm-2.24.0-fix-icon-scale.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=554523
 Patch11: gdm-2.24.0-add-panel-slide.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=465121
+Patch12: gdm-user-switcher-no-help.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -128,6 +131,7 @@ multiple simulanteous logged in users.
 %patch9 -p1 -b .fix-crash
 %patch10 -p1 -b .fix-icon-scale
 %patch11 -p1 -b .add-panel-slide
+%patch12 -p1 -b .no-help
 
 %patch99 -p1 -b .fedora-logo
 
@@ -330,6 +334,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Oct  3 2008 Matthias Clasen  <mclasen@redhat.com> - 1:2.24.0-8
+- Don't show a non-functional help menuitem
+
 * Tue Sep 30 2008 Ray Strode <rstrode@redhat.com> - 1:2.24.0-7
 - Make panel slide in initially like the gnome panel