diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6375a4a..00b7c4b 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.6.1
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,6 +113,8 @@ Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
 Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch
 
 Patch6040: xserver-1.6.1-vt-switch.patch
+# from upstream, nominated for 1.6.2 (#499792)
+Patch6041: xserver-1.6.1-synaptics.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -546,6 +548,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 11 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.1-14
+- xserver-1.6.1-synaptics.patch: Don't synthesize a mouse section if
+  unreferenced synaptics devices are found in the xorg.conf (#499792)
+
 * Fri May 08 2009 Adam Jackson <ajax@redhat.com> 1.6.1-13
 - xserver-1.6.1-vt-switch.patch: Synthesize key releases on vt switch away,
   not just on return.  Fixes CPU usage bug while switched away. (#484393)
diff --git a/xserver-1.6.1-synaptics.patch b/xserver-1.6.1-synaptics.patch
new file mode 100644
index 0000000..fa47b08
--- /dev/null
+++ b/xserver-1.6.1-synaptics.patch
@@ -0,0 +1,27 @@
+From 8663524ce398b56af596ab1e7e96b62ca45b79e9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 13 Apr 2009 17:49:00 +1000
+Subject: [PATCH] xfree86: don't synthesise a mouse section if synaptics devices are found.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/common/xf86Config.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 9e56ca9..92b6aba 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1329,7 +1329,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
+      */
+     for (devs = servlayoutp->inputs; devs && *devs; devs++) {
+ 	if (!strcmp((*devs)->driver, "void") || !strcmp((*devs)->driver, "mouse") ||
+-            !strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev")) {
++            !strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev") ||
++            !strcmp((*devs)->driver, "synaptics")) {
+ 	    found = 1; break;
+ 	}
+     }
+-- 
+1.6.3.rc1.2.g3c17d.dirty
+