diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8b1f774..a8c3b35 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.4
-Release:   0.3%{?dist}
+Release:   0.4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -115,6 +115,8 @@ Patch6049: xserver-1.6.99-dpms.patch
 # Nominated for 1.6.4
 Patch6050: xserver-1.6.3-coreevents.patch
 
+Patch6051: xserver-1.6.4-sigprocmask-less.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -535,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 18 2010 Adam Jackson <ajax@redhat.com> 1.6.4-0.4
+- xserver-1.6.4-sigprocmask-less.patch: Optimize input processing.
+
 * Thu Oct 08 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-0.3
 - xserver-1.6.1-mousedrivers.patch: fix typo causing invalid memory access
   (#522936)
diff --git a/xserver-1.6.4-sigprocmask-less.patch b/xserver-1.6.4-sigprocmask-less.patch
new file mode 100644
index 0000000..0bb4c11
--- /dev/null
+++ b/xserver-1.6.4-sigprocmask-less.patch
@@ -0,0 +1,37 @@
+From ae68be312619ad3bcb2d550a6267d38cce3284f5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 13 Feb 2009 17:25:32 -0500
+Subject: [PATCH] Input: Don't re-block SIGIO in xf86SigioReadInput()
+
+It's already blocked on the way in, because we asked for it to be
+blocked at sigaction() time.
+---
+ hw/xfree86/common/xf86Events.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
+index 592d4e3..9ed2884 100644
+--- a/hw/xfree86/common/xf86Events.c
++++ b/hw/xfree86/common/xf86Events.c
+@@ -304,16 +304,13 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
+  *    signal handler for the SIGIO signal.
+  */
+ static void
+-xf86SigioReadInput(int fd,
+-		   void *closure)
++xf86SigioReadInput(int fd, void *closure)
+ {
+     int errno_save = errno;
+-    int sigstate = xf86BlockSIGIO();
+-    InputInfoPtr pInfo = (InputInfoPtr) closure;
++    InputInfoPtr pInfo = closure;
+ 
+     pInfo->read_input(pInfo);
+ 
+-    xf86UnblockSIGIO(sigstate);
+     errno = errno_save;
+ }
+ 
+-- 
+1.7.0.1
+