diff --git a/gnome-screensaver-2.25.2-xf86misc.patch b/gnome-screensaver-2.25.2-xf86misc.patch
new file mode 100644
index 0000000..161f926
--- /dev/null
+++ b/gnome-screensaver-2.25.2-xf86misc.patch
@@ -0,0 +1,17 @@
+diff -up gnome-screensaver-2.25.2/src/gs-grab-x11.c.jx gnome-screensaver-2.25.2/src/gs-grab-x11.c
+--- gnome-screensaver-2.25.2/src/gs-grab-x11.c.jx	2008-11-13 15:06:55.000000000 -0500
++++ gnome-screensaver-2.25.2/src/gs-grab-x11.c	2009-02-26 10:07:05.000000000 -0500
+@@ -118,7 +118,12 @@ static void
+ xorg_lock_smasher_set_active (GSGrab  *grab,
+                               gboolean active)
+ {
+-        int status;
++        int status, event, error;
++
++	if (!XF86MiscQueryExtension (GDK_DISPLAY (), &event, &error)) {
++		gs_debug ("No XFree86-Misc extension present");
++		return;
++	}
+ 
+         if (active) {
+                 gs_debug ("Enabling the x.org grab smasher");
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index d8ef304..00d98d0 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.25.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.25/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 Patch9: password-entry.patch
 # fixed upstream
 Patch10: path.patch
+Patch11: gnome-screensaver-2.25.2-xf86misc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -88,6 +89,7 @@ simple, sane, secure defaults and be well integrated with the desktop.
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .password-entry
 %patch10 -p0 -b .path
+%patch11 -p1 -b .xf86misc
 libtoolize --force --copy
 
 %build
@@ -156,6 +158,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Thu Feb 26 2009 Adam Jackson <ajax@redhat.com> 2.25.2-6
+- gnome-screensaver-2.25.2-xf86misc.patch: Don't carp about missing
+  XFree86-Misc extension. (#486841)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild