diff --git a/synergy-1.3.1-stuttered-delay-fix-fix.patch b/synergy-1.3.1-stuttered-delay-fix-fix.patch
new file mode 100644
index 0000000..d63e492
--- /dev/null
+++ b/synergy-1.3.1-stuttered-delay-fix-fix.patch
@@ -0,0 +1,11 @@
+--- lib/platform/CXWindowsEventQueueBuffer.cpp~	2009-02-23 01:37:24.000000000 +0100
++++ lib/platform/CXWindowsEventQueueBuffer.cpp	2009-02-23 01:55:05.000000000 +0100
+@@ -117,7 +117,7 @@
+ 	// we want to give the cpu a chance s owe up this to 25ms
+ #define TIMEOUT_DELAY 25
+ 
+-	while( remaining > 0 && QLength(m_display)==0 && retval==0){
++	while( ((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
+ #if HAVE_POLL
+ 	retval = poll(pfds, 1, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
+ #else
diff --git a/synergy.spec b/synergy.spec
index c12d816..bae9106 100644
--- a/synergy.spec
+++ b/synergy.spec
@@ -1,7 +1,7 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
 Version: 1.3.1
-Release: 10%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
@@ -15,6 +15,7 @@ Patch4: synergy-1.3.1-X11-DPMS.patch
 Patch5: synergy-1.3.1-warnings.patch
 # http://sf.net/tracker/?func=detail&atid=490469&aid=2141567&group_id=59275
 Patch6: synergy-1.3.1-stuttered-delay-fix.patch
+Patch7: synergy-1.3.1-stuttered-delay-fix-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
 BuildRequires: libXinerama-devel
@@ -35,6 +36,7 @@ own display.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 
 %build
@@ -65,6 +67,12 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Thu Feb 26 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-12
+- Include patch to fix the fix for delay issues (#471259).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Nov  4 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-10
 - Include patch to fix delay issues (#469422).