diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 005cdb5..089756e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -97,6 +97,9 @@ Patch6006: xserver-1.5.2-sbusAutoDetection.patch
 
 Patch6007: xserver-1.5.3-aspect-me-harder.patch
 
+# pushed upstream
+Patch6008: xserver-1.5.3-xinerama-events.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -528,6 +531,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-10
+- xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
+  Xinerama is present (#473825)
+
 * Tue Jan 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-9
 - replace fedora-setup-keyboard with pure python one (#478431)
 
diff --git a/xserver-1.5.3-xinerama-events.patch b/xserver-1.5.3-xinerama-events.patch
new file mode 100644
index 0000000..f2f077c
--- /dev/null
+++ b/xserver-1.5.3-xinerama-events.patch
@@ -0,0 +1,37 @@
+From 3db0bec7de9d93a6b8d0773c969c760cef51314a Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Fri, 30 Jan 2009 10:19:01 +1000
+Subject: [PATCH] mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
+
+In Xinerama all windows hang off the first root window. Crossing the screens
+must not reset the spriteTrace, otherwise picking fails and events are sent to
+the root window.
+
+X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
+---
+ mi/mipointer.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/mi/mipointer.c b/mi/mipointer.c
+index b55e68b..195243d 100644
+--- a/mi/mipointer.c
++++ b/mi/mipointer.c
+@@ -260,7 +260,14 @@ miPointerWarpCursor (pScreen, x, y)
+ 	miPointer.pScreen = pScreen;
+     }
+ 
+-    if (changedScreen)
++    /* Don't call USFS if we use Xinerama, otherwise the root window is
++     * updated to the second screen, and we never receive any events.
++     * (FDO bug #18668) */
++    if (changedScreen
++#ifdef PANORAMIX
++            && noPanoramiXExtension
++#endif
++       )
+         UpdateSpriteForScreen (pScreen) ;
+ }
+ 
+-- 
+1.6.0.6
+