diff --git a/.gitattributes b/.gitattributes
index 9b03811..e8b5d8b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+xorg.conf.man-070818.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/disable-root-xorg_conf.diff b/disable-root-xorg_conf.diff
index e828d43..4f98a6d 100644
--- a/disable-root-xorg_conf.diff
+++ b/disable-root-xorg_conf.diff
@@ -17,7 +17,7 @@ diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre
  .IB /etc/X11/ $XORGCONFIG
  .IB __projectroot__/etc/X11/ $XORGCONFIG
 -.BI $HOME /__xconfigfile__
- .I /etc/X11/__xconfigfile__-4
+ .I /etc/X11/__xconfigfile__\-4
  .I /etc/X11/__xconfigfile__
  .I /etc/__xconfigfile__
 @@ -85,10 +84,7 @@ is the path specified with the
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 1b4fbef..87588cc 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Aug 18 11:05:14 CEST 2007 - sndirsch@suse.de
+
+- disable AIGLX by default; without enabled Composite extension 
+  (still problematic on many drivers) it's rather useless anyway
+- updated xorg.conf manual page
+
 -------------------------------------------------------------------
 Sat Aug 11 14:02:02 CEST 2007 - dmueller@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7017c9d..9244fe5 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        117
+Release:        121
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -45,6 +45,7 @@ Source5:        modprobe.nvidia
 Source6:        0018-vnc-support.txt.mbox
 %endif
 Source7:        xorg-docs-1.4.tar.bz2
+Source8:        xorg.conf.man-070818.tar
 Patch:          64bit.diff
 Patch1:         fpic.diff
 Patch2:         p_default-module-path.diff
@@ -145,7 +146,7 @@ An X Window System server for Virtual Network Computing (VNC).
 
 %endif
 %prep
-%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7
+%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7 -a8
 # make legal department happy (Bug #204110)
 test -f ../Mesa-7.0.1/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
 test -f ../Mesa-7.0.1/progs/ggi/asc-view.c && exit 1
@@ -169,9 +170,7 @@ test -f ../Mesa-7.0.1/progs/ggi/asc-view.c && exit 1
 pushd hw/xfree86/os-support
 %patch18
 popd
-%if %suse_version <= 1010
 %patch19
-%endif
 %patch22
 %patch23
 %patch25 -p1
@@ -538,6 +537,10 @@ exit 0
 %endif
 
 %changelog
+* Sat Aug 18 2007 - sndirsch@suse.de
+- disable AIGLX by default; without enabled Composite extension
+  (still problematic on many drivers) it's rather useless anyway
+- updated xorg.conf manual page
 * Sat Aug 11 2007 - dmueller@suse.de
 - fix fileconflict over doc/MAINTAINERS
 - build parallel
diff --git a/xorg.conf.man-070818.tar b/xorg.conf.man-070818.tar
new file mode 100644
index 0000000..c655ded
--- /dev/null
+++ b/xorg.conf.man-070818.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91cce526cd1e3c995594434b9cfbf271c7e739b3367153c73e7311ebb731788b
+size 71680