diff --git a/0001-glamor-make-current-in-prepare-paths.patch b/0001-glamor-make-current-in-prepare-paths.patch
deleted file mode 100644
index 6167395..0000000
--- a/0001-glamor-make-current-in-prepare-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 422a9f7f37eb6027fa4d20a4be208978832be6d6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 15 Jul 2015 17:54:03 +1000
-Subject: [PATCH] glamor: make current in prepare paths
-
-Lots of the accel paths only make current once they start
-doing someting, so a lot of them call the bail paths without
-make current, which means on PRIME systems for example
-we end up in the wrong context.
-
-Add a prepare pixmap in the prepare fallback path.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
- glamor/glamor_prepare.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
-index 9bfc557..68fb58f 100644
---- a/glamor/glamor_prepare.c
-+++ b/glamor/glamor_prepare.c
-@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
-     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
-         return TRUE;
- 
-+    glamor_make_current(glamor_priv);
-+
-     RegionInit(&region, box, 1);
- 
-     /* See if it's already mapped */
--- 
-2.4.3
-
diff --git a/commitid b/commitid
index a71f846..6275203 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-a8a0f6464a33c12c1de495d74fd478c0d952643e
+634e357be2ec400f63bd5c42f706b709b6ddabc3
diff --git a/sources b/sources
index cff7d98..bd7f31a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-397e405566651150490ff493e463f1ad  xorg-server-1.17.2.tar.bz2
-00230d3aae5d5096dd82b0e4e087dbce  xorg-server-20150728.tar.xz
+1c03f8b6700e230253354931e9264b17  xorg-server-20150907.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 63b83a5..79b4251 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -11,7 +11,7 @@
 # X.org requires lazy relocations to work.
 %undefine _hardened_build
 
-%global gitdate 20150728
+%global gitdate 20150907
 %global stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -45,7 +45,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.18.0
-Release:   0.1%{?gitdate:.%{gitdate}}%{dist}
+Release:   0.2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -631,6 +631,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Mon Sep 07 2015 Dave Airlie <airlied@redhat.com> 1.18.0-0.2
+- update to git snapshot of 1.7.99 (1.18.0 rc1)
+
 * Wed Jul 29 2015 Dave Airlie <airlied@redhat.com> 1.18.0-0.1
 - git snapshot of what will be 1.18.0 (should be ABI stable)