diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 483066b..f10c89f 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb  7 16:58:55 UTC 2012 - sndirsch@suse.com
+
+- instead of using LD_PRELOAD link the fake libs against the
+  freshly introduced libxcb-util; hope this works out ...
+  Still this does not help on openSuSE 11.4 (bnc#742297)
+
 -------------------------------------------------------------------
 Fri Feb  3 10:14:23 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.csh b/xorg-x11-libs.csh
deleted file mode 100644
index 27a2e46..0000000
--- a/xorg-x11-libs.csh
+++ /dev/null
@@ -1,7 +0,0 @@
-# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
-if ( ${?LD_PRELOAD} ) then
-        setenv LD_PRELOAD "${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
-else
-        setenv LD_PRELOAD /usr/lib64/libxcb-util.so.0
-endif
-
diff --git a/xorg-x11-libs.sh b/xorg-x11-libs.sh
deleted file mode 100644
index f2d73bb..0000000
--- a/xorg-x11-libs.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
-if [ -z "$LD_PRELOAD" ]; then
-        export LD_PRELOAD=/usr/lib64/libxcb-util.so.0
-else
-        export LD_PRELOAD="${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
-fi
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 2a7e120..26d4cab 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -69,8 +69,6 @@ Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.3.8.tar.bz2
 Source90:       baselibs.conf
-Source91:       xorg-x11-libs.sh
-Source92:       xorg-x11-libs.csh
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
@@ -100,10 +98,6 @@ This package contains all necessary include files and libraries needed
 to develop X11 applications that require these.
 
 %prep
-%ifarch %ix86
-sed -i  's/lib64/%{_lib}/g' %{SOURCE91}
-sed -i  's/lib64/%{_lib}/g' %{SOURCE92}
-%endif
 %setup -q -T -c %{name}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src
@@ -158,14 +152,9 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
   > xcb-${ext}.c
   gcc -Wall -ansi -pedantic -c xcb-${ext}.c -fPIC
   gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
+      -Wl,-L$RPM_BUILD_ROOT%{_libdir},--no-as-needed,-lxcb-util \
       -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
 done
-%if %suse_version < 1220
-# still we need a LD_PRELOAD for the freshly introduced libxcb-util
-# (bnc #742297)
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
-install -m 644 %{SOURCE91} %{SOURCE92} $RPM_BUILD_ROOT/etc/profile.d/
-%endif
 %if %suse_version > 1110
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %endif
@@ -180,11 +169,6 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
-%if %suse_version < 1220
-%dir /etc/profile.d
-/etc/profile.d/xorg-x11-libs.csh
-/etc/profile.d/xorg-x11-libs.sh
-%endif
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*