diff --git a/driver-abi-rebuild.sh b/driver-abi-rebuild.sh
index b1276d9..f1fc522 100755
--- a/driver-abi-rebuild.sh
+++ b/driver-abi-rebuild.sh
@@ -31,7 +31,7 @@ driverlist=$(grep ^Requires *.spec | awk '{ print $2 }')
 popd
 
 # Things not in -drivers for whatever reason...
-extradrivers="xorg-x11-drv-ivtv"
+extradrivers="xorg-x11-glamor xorg-x11-drv-ivtv"
 
 rm -rf xorg-x11-drivers
 echo $driverlist $extradrivers | xargs -n1 $pkg co $branch
@@ -39,12 +39,17 @@ echo $driverlist $extradrivers | xargs -n1 $pkg co $branch
 for i in xorg-x11-drv-*/ ; do
     [ -e $i/dead.package ] && continue
     pushd $i
-    #rpmdev-bumpspec -c "- 1.15RC4 ABI rebuild" *.spec
-    #$pkg commit -c -p && $pkg build --nowait
+    rpmdev-bumpspec -c "- 1.15 ABI rebuild" *.spec
+    $pkg commit -c -p && $pkg build --nowait
     #$pkg mockbuild
-    $pkg srpm
+    #$pkg srpm
     #mockchain -r fedora-20-x86_64 -l $OLDPWD
     #mockchain -r rhel-7.0-candidate-x86_64 -l $OLDPWD
+
+    if [ $i = "xorg-x11-glamor" ]; then
+        koji wait-repo f21-build --build $($pkg verrel)
+    fi
+
     popd
 done
 
diff --git a/exa-only-draw-valid-trapezoids.patch b/exa-only-draw-valid-trapezoids.patch
new file mode 100644
index 0000000..59cc5d6
--- /dev/null
+++ b/exa-only-draw-valid-trapezoids.patch
@@ -0,0 +1,48 @@
+From patchwork Wed Oct  2 13:47:54 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: exa: only draw valid trapezoids
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+X-Patchwork-Id: 14769
+Message-Id: <524C240A.9010607@canonical.com>
+To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org>
+Date: Wed, 02 Oct 2013 15:47:54 +0200
+
+Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484
+
+If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly.
+A similar fix should also be applied to pixman.
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+
+---
+
+
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 172e2b5..807eeba 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
+@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+ 
+         exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+         for (; ntrap; ntrap--, traps++)
+-            (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
++            if (xTrapezoidValid(traps))
++                (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
+         exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+ 
+         xRel = bounds.x1 + xSrc - xDst;
+diff --git a/render/picture.h b/render/picture.h
+index c85353a..fcd6401 100644
+--- a/render/picture.h
++++ b/render/picture.h
+@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed;
+ /* whether 't' is a well defined not obviously empty trapezoid */
+ #define xTrapezoidValid(t)  ((t)->left.p1.y != (t)->left.p2.y && \
+ 			     (t)->right.p1.y != (t)->right.p2.y && \
+-			     (int) ((t)->bottom - (t)->top) > 0)
++			     ((t)->bottom > (t)->top))
+ 
+ /*
+  * Standard NTSC luminance conversions:
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 05f4122..2e7abe9 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.15.0
-Release:   1%{?gitdate:.%{gitdate}}%{dist}
+Release:   2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -138,6 +138,9 @@ Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch
 Patch9001: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
 Patch9002: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch
 
+# submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
+Patch9100: exa-only-draw-valid-trapezoids.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -633,6 +636,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jan 14 2014 Adam Jackson <ajax@redhat.com> 1.15.0-2
+- exa-only-draw-valid-trapezoids.patch: Fix crash in exa.
+
 * Mon Jan 13 2014 Adam Jackson <ajax@redhat.com> 1.15.0-1
 - xserver 1.15.0