diff --git a/p_default-module-path.diff b/p_default-module-path.diff
index fe1011b..2f36379 100644
--- a/p_default-module-path.diff
+++ b/p_default-module-path.diff
@@ -29,7 +29,7 @@ diff -u -r hw/xfree86.orig/loader/loader.c hw/xfree86/loader/loader.c
  xf86PrintDefaultModulePath(void)
  {
 -  ErrorF("%s\n", DEFAULT_MODULE_PATH);
-+  ErrorF("/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules\n");
++  ErrorF("/usr/LIBDIR/xorg/modules\n");
  }
  
  static void
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 1824e88..70ddb84 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 30 12:16:47 CEST 2007 - sndirsch@suse.de
+
+- p_default-module-path.diff:
+  * only return /usr/%lib/xorg/modules in "-showDefaultModulePath"
+    Xserver option (Bug #257360)
+- set Xserver version to 7.2.0 with configure option
+  (Bugs #257360, #253702)
+
 -------------------------------------------------------------------
 Tue Mar 27 21:47:36 CEST 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5744fbf..6cbb49e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -12,7 +12,7 @@
 
 Name:           xorg-x11-server
 %define dirsuffix 1.2.99.903
-%define fglrx_driver_hack 0
+%define fglrx_driver_hack 1
 %define vnc 0
 BuildRequires:  Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
 %if %vnc
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        65
+Release:        66
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -207,11 +207,11 @@ autoreconf -fi
 ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %if %fglrx_driver_hack
             --with-release-major=7 \
-            --with-release-minor=1 \
+            --with-release-minor=2 \
             --with-release-patch=0 \
             --with-release-snap=0 \
             --with-release-date="%(date)" \
-            --with-release-version=7.1.0.0 \
+            --with-release-version=7.2.0.0 \
 %endif
 %if %vnc
 %ifnarch s390 s390x
@@ -531,6 +531,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Mar 30 2007 - sndirsch@suse.de
+- p_default-module-path.diff:
+  * only return /usr/%%lib/xorg/modules in "-showDefaultModulePath"
+  Xserver option (Bug #257360)
+- set Xserver version to 7.2.0 with configure option
+  (Bugs #257360, #253702)
 * Tue Mar 27 2007 - sndirsch@suse.de
 - xserver 1.2.99.903 release:
   * Create driver-independent CRTC-based cursor layer.