diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c06d916..ba5d0f8 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -8,7 +8,7 @@ Version:   1.1.1
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   25%{?dist}
+Release:   26%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -51,6 +51,7 @@ Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 Patch2005:  xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
 Patch2006:  xorg-x11-server-1.1.1-revert-xkb-change.patch
+Patch2007:  xorg-x11-server-1.1.1-aiglx-locking.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -355,6 +356,7 @@ drivers, input drivers, or other X modules should install this package.
 %patch2004 -p1 -b .zlib
 %patch2005 -p1 -b .Xdmx
 %patch2006 -p1 -b .revert-xkb-change
+%patch2007 -p1 -b .aiglx-locking
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -699,6 +701,9 @@ rm -rf $RPM_BUILD_ROOT
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug 21 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-26.fc6
+- Add Tilman Sauerbecks patch to fix AIGLX DRI locking.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-25.fc6
 - xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
   to also disable the Composite extension.