diff --git a/0001-present-fail-flipping-if-we-have-any-slave-outputs.patch b/0001-present-fail-flipping-if-we-have-any-slave-outputs.patch
deleted file mode 100644
index 104cfc6..0000000
--- a/0001-present-fail-flipping-if-we-have-any-slave-outputs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b0c7318ecc3e3817f8cf3519d229640a1ff73712 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Tue, 9 Feb 2016 16:46:52 +1000
-Subject: [PATCH] present: fail flipping if we have any slave outputs.
-
-Due to the way present currently works, we don't ever
-check with the secondary adapters if we can flip at all.
-
-We shouldn't flip if the secondary adapters are attached
-to the pixmap currently, however using the current check_flip
-callback isn't possible as it passes the Window to the driver
-(something we shouldn't be doing), so the slave driver can never
-get it's own screen ptr back.
-
-For now to fix the problem just block flips if we have any
-slaves configured. We can fix the ABI up later, but this
-fix can be backported to stable.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
- present/present.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/present/present.c b/present/present.c
-index 8cf3b6f..cb3c7ea 100644
---- a/present/present.c
-+++ b/present/present.c
-@@ -122,6 +122,10 @@ present_check_flip(RRCrtcPtr    crtc,
-     if (!screen_priv->info->flip)
-         return FALSE;
- 
-+    /* Fail to flip if we have slave outputs */
-+    if (!xorg_list_is_empty(&screen->output_slave_list))
-+        return FALSE;
-+
-     /* Make sure the window hasn't been redirected with Composite */
-     window_pixmap = screen->GetWindowPixmap(window);
-     if (window_pixmap != screen->GetScreenPixmap(screen) &&
--- 
-2.5.0
-
diff --git a/sources b/sources
index bf90f6e..918020e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3c1c1057d3ad27380d8dd87ffcc182cd  xorg-server-1.18.0.tar.bz2
-1b9e85420c3790dd487addd50313f4da  xorg-server-1.18.1.tar.bz2
+052fc1b4b12a5df0a3e35a1b46a52db3  xorg-server-1.18.2.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3541a5b..7883ef1 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -44,8 +44,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.18.1
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.18.2
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -91,8 +91,6 @@ Patch7027: xserver-autobind-hotplug.patch
 # submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
 Patch9100: exa-only-draw-valid-trapezoids.patch
 
-Patch9101: 0001-present-fail-flipping-if-we-have-any-slave-outputs.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1282252
 Patch9200: 0001-Xi-don-t-deliver-emulated-motion-events-for-non-emul.patch
 
@@ -433,6 +431,7 @@ autoreconf -f -v --install || exit 1
 # XXX without dtrace
 
 %configure %{xservers} \
+	--enable-dependency-tracking \
 	--disable-static \
 	--with-pic \
 	%{?no_int10} --with-int10=x86emu \
@@ -635,6 +634,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Fri Mar 11 2016 Adam Jackson <ajax@redhat.com> 1.18.2-1
+- xserver 1.18.2
+
 * Wed Mar 09 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.18.1-3
 - Stop bug warnings on three-finger pinch gestures (#1282252)