diff --git a/.gitignore b/.gitignore
index 9d9355b..39afc54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-20120103.tar.xz
 /xorg-server-20120124.tar.xz
 /xorg-server-20120215.tar.xz
+/xorg-server-1.12.0.tar.bz2
diff --git a/sources b/sources
index 95ebe07..6681ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c1392aeef04d011b4a79f010c157dab  xorg-server-20120215.tar.xz
+3a3c4281f32c8702749e8f129372a355  xorg-server-1.12.0.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b6f3d22..989b0c3 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-%define gitdate 20120215
+#define gitdate 20120215
 %define stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.11.99.903
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.0
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -102,9 +102,6 @@ Patch7007: xserver-1.10.99.1-test.patch
 # RedHat/Fedora-specific patch
 Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 
-# Bug 788632 - all scrolled windows jump up one page after you middle click a link
-Patch7014: xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -566,6 +563,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Mar 05 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.0-1
+- xserver 1.12
+- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch:
+  drop, 6f2838818
+
 * Thu Feb 16 2012 Adam Jackson <ajax@redhat.com> 1.11.99.903-2.20120215
 - Don't pretend int10 is a thing on non-PC arches
 
diff --git a/xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch b/xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch
deleted file mode 100644
index 61199f3..0000000
--- a/xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6538a7d96844526516dd76ec5c4159abfb56cefe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Sat, 11 Feb 2012 01:29:26 +1000
-Subject: [PATCH] dix: reset last.scroll when resetting the valuator (#45611)
-
-last.scroll remained on the last-submitted scrolling value but last.valuator
-was changed whenever the slave device changed. The first scrolling delta
-after a switch was then calculated as (last.scroll - new abs value), causing
-erroneous scrolling events.
-
-Test case:
-- synaptics with a scrolling method enabled, other device with 3+ axes (e.g.
-  wacom)
-- scroll on touchpad
-- use other device
-- scroll on touchpad
-
-The second scroll caused erroneous button press/release events.
-
-X.Org Bug 45611 <http://bugs.freedesktop.org/show_bug.cgi?id=45611>
----
- dix/getevents.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 7678aa1..6ea4ba0 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -360,6 +360,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
-             if (i >= lastSlave->valuator->numAxes)
-             {
-                 pDev->last.valuators[i] = 0;
-+                valuator_mask_set_double(pDev->last.scroll, i, 0);
-             }
-             else
-             {
-@@ -367,6 +368,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
-                 val = rescaleValuatorAxis(val, lastSlave->valuator->axes + i,
-                                           pDev->valuator->axes + i, 0, 0);
-                 pDev->last.valuators[i] = val;
-+                valuator_mask_set_double(pDev->last.scroll, i, val);
-             }
-         }
-     }
--- 
-1.7.7.5
-