diff --git a/.gitignore b/.gitignore
index a613892..0ef7a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-20120215.tar.xz
 /xorg-server-1.12.0.tar.bz2
 /xorg-server-1.12.1.tar.bz2
+/xorg-server-1.12.2.tar.bz2
diff --git a/sources b/sources
index 6e1fab1..7ad7c27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20e73b422bda6f0d1405af676983cc70  xorg-server-1.12.1.tar.bz2
+791f0323b886abb7954de7f042bb7dc6  xorg-server-1.12.2.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0cbb42f..2179db3 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.12.1
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.2
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -99,9 +99,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 # RedHat/Fedora-specific patch
 Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 
-# 814869, fix from upstream 1.12 branch
-Patch7014: xserver-1.12-os-make-timers-signal-safe.patch
-
 # backport pci slot claiming fix for kms drivers
 Patch7015: xserver-fix-pci-slot-claims.patch
 # backport modesetting fallback driver
@@ -576,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed May 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-1
+- xserver 1.12.2
+
 * Fri May 25 2012 Dave Airlie <airlied@redhat.com> 1.12.1-2
 - xserver-fix-pci-slot-claims.patch: backport slot claiming fix from master
 - xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list
diff --git a/xserver-1.12-os-make-timers-signal-safe.patch b/xserver-1.12-os-make-timers-signal-safe.patch
deleted file mode 100644
index ec47c9e..0000000
--- a/xserver-1.12-os-make-timers-signal-safe.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From be0213313d42beeaaa4aa4a9637f2df8a849c98e Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 27 Apr 2012 10:52:39 +1000
-Subject: [PATCH 7/7] os: make timers signal-safe
-
-If TimerSet() is called from a signal handler (synaptics tap handling code)
-may result in list corruption if we're currently inside TimerSet().
-
-See backtrace in
-https://bugzilla.redhat.com/show_bug.cgi?id=814869
-
-Block signals for all list manipulations in the timers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- os/WaitFor.c |   18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index 4c3be34..59f3af6 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -382,6 +382,7 @@ CheckAllTimers(void)
-     OsTimerPtr timer;
-     CARD32 now;
- 
-+    OsBlockSignals();
-  start:
-     now = GetTimeInMillis();
- 
-@@ -391,6 +392,7 @@ CheckAllTimers(void)
-             goto start;
-         }
-     }
-+    OsReleaseSignals();
- }
- 
- static void
-@@ -398,11 +400,13 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
- {
-     CARD32 newTime;
- 
-+    OsBlockSignals();
-     *prev = timer->next;
-     timer->next = NULL;
-     newTime = (*timer->callback) (timer, now, timer->arg);
-     if (newTime)
-         TimerSet(timer, 0, newTime, timer->callback, timer->arg);
-+    OsReleaseSignals();
- }
- 
- OsTimerPtr
-@@ -418,6 +422,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
-             return NULL;
-     }
-     else {
-+        OsBlockSignals();
-         for (prev = &timers; *prev; prev = &(*prev)->next) {
-             if (*prev == timer) {
-                 *prev = timer->next;
-@@ -426,6 +431,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
-                 break;
-             }
-         }
-+        OsReleaseSignals();
-     }
-     if (!millis)
-         return timer;
-@@ -445,26 +451,32 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
-         if (!millis)
-             return timer;
-     }
-+    OsBlockSignals();
-     for (prev = &timers;
-          *prev && (int) ((*prev)->expires - millis) <= 0;
-          prev = &(*prev)->next);
-     timer->next = *prev;
-     *prev = timer;
-+    OsReleaseSignals();
-     return timer;
- }
- 
- Bool
- TimerForce(OsTimerPtr timer)
- {
-+    int rc = FALSE;
-     OsTimerPtr *prev;
- 
-+    OsBlockSignals();
-     for (prev = &timers; *prev; prev = &(*prev)->next) {
-         if (*prev == timer) {
-             DoTimer(timer, GetTimeInMillis(), prev);
--            return TRUE;
-+            rc = TRUE;
-+            break;
-         }
-     }
--    return FALSE;
-+    OsReleaseSignals();
-+    return rc;
- }
- 
- void
-@@ -474,12 +486,14 @@ TimerCancel(OsTimerPtr timer)
- 
-     if (!timer)
-         return;
-+    OsBlockSignals();
-     for (prev = &timers; *prev; prev = &(*prev)->next) {
-         if (*prev == timer) {
-             *prev = timer->next;
-             break;
-         }
-     }
-+    OsReleaseSignals();
- }
- 
- void
--- 
-1.7.10.1
-