diff --git a/xorg-server-commit-21ed660.diff b/xorg-server-commit-21ed660.diff
new file mode 100644
index 0000000..7acb66c
--- /dev/null
+++ b/xorg-server-commit-21ed660.diff
@@ -0,0 +1,32 @@
+commit 21ed660f30a3f96c787ab00a16499e0fb034b2ad
+Author: Chris Humbert <freedesktop@mahadri.com>
+Date:   Fri May 7 17:02:43 2010 +1000
+
+    dix: make DeviceEvent coordinates signed for Xinerama. #24986
+    
+    With Xinerama enabled, event coordinates are relative to Screen 0, so
+    they can be negative.  The new DeviceEvent's coordinates are of type
+    uint16_t, making screens above and to the left of Screen 0 unusable.
+    
+    X.Org Bug 24986 <https://bugs.freedesktop.org/show_bug.cgi?id=24986>
+    
+    Signed-off-by: Chris Humbert <freedesktop@mahadri.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+diff --git a/include/eventstr.h b/include/eventstr.h
+index 79685c1..433227e 100644
+--- a/include/eventstr.h
++++ b/include/eventstr.h
+@@ -91,9 +91,9 @@ struct _DeviceEvent
+         uint32_t button;  /**< Button number */
+         uint32_t key;     /**< Key code */
+     } detail;
+-    uint16_t root_x;      /**< Pos relative to root window in integral data */
++    int16_t root_x;       /**< Pos relative to root window in integral data */
+     float root_x_frac;    /**< Pos relative to root window in frac part */
+-    uint16_t root_y;      /**< Pos relative to root window in integral part */
++    int16_t root_y;       /**< Pos relative to root window in integral part */
+     float root_y_frac;    /**< Pos relative to root window in frac part */
+     uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
+     struct {
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index b41ac11..f579492 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 16 12:50:39 CEST 2010 - sndirsch@suse.de
+
+- xorg-server-commit-21ed660.diff
+  * dix: make DeviceEvent coordinates signed for Xinerama 
+    (bnc #628295, bfo #24986)
+
 -------------------------------------------------------------------
 Tue Aug 10 20:56:13 CEST 2010 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b805149..c41c9a2 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -117,6 +117,7 @@ Patch212:       dmx-silly.patch
 Patch213:       xorg-server-xdmcp.patch
 Patch214:       xorg-x11-server-gl-apps-crash.patch
 Patch215:       xorg-server-revert-event-mask.patch
+Patch216:       xorg-server-commit-21ed660.diff
 %if %moblin
 Patch300:       moblin-use_preferred_mode_for_all_outputs.diff
 %endif
@@ -244,6 +245,7 @@ popd
 %patch213 -p1
 %patch214 -p1
 %patch215 -p1
+%patch216 -p1
 %if %moblin
 %patch300 -p1
 %endif