diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index e8869d8..1d9c678 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 16 09:03:31 CET 2009 - sndirsch@suse.de
+
+- /var/X11R6/bin no longer covered by FHS; switched to 
+  /var/lib/X11 (bnc #470969)
+
 -------------------------------------------------------------------
 Sat Jan 31 15:21:21 CET 2009 - schwab@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 937d349..9112a8e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -29,7 +29,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        24
+Release:        25
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -321,9 +321,9 @@ ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X
 ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg
 %endif
 chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
-mkdir -p $RPM_BUILD_ROOT/var/X11R6/bin
-ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/X11R6/bin/X
-ln -snf ../../var/X11R6/bin/X $RPM_BUILD_ROOT/usr/bin/X
+mkdir -p $RPM_BUILD_ROOT/var/lib/X11
+ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/lib/X11/X
+ln -snf ../../var/lib/X11/X $RPM_BUILD_ROOT/usr/bin/X
 mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
 install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
 %if %suse_version <= 1010
@@ -475,7 +475,7 @@ exit 0
 %endif
 %dir /usr/%{_lib}/xorg
 %ifnarch s390 s390x
-%dir /var/X11R6/bin
+%dir /var/lib/X11
 %endif
 %dir /var/lib/xkb
 %dir /var/lib/xkb/compiled
@@ -532,7 +532,7 @@ exit 0
 %endif
 %{_mandir}/man7/*
 %ifnarch s390 s390x
-/var/X11R6/bin/X
+/var/lib/X11/X
 %endif
 /var/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
@@ -566,6 +566,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Feb 16 2009 sndirsch@suse.de
+- /var/X11R6/bin no longer covered by FHS; switched to
+  /var/lib/X11 (bnc #470969)
 * Sat Jan 31 2009 schwab@suse.de
 - Provide proper fallback when legacy_mem is not available.
 * Thu Jan 29 2009 sndirsch@suse.de