diff --git a/libxtrap-pcfix.patch b/libXTrap-pcfix.diff
similarity index 100%
rename from libxtrap-pcfix.patch
rename to libXTrap-pcfix.diff
diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index c0711b3..9ebfa30 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Apr 11 16:40:46 CEST 2010 - sndirsch@suse.de
+
+- libxtrap-pcfix.patch --> libXTrap-pcfix.diff
+- specfile cleanup 
+
 -------------------------------------------------------------------
 Mon Apr  5 07:11:20 CEST 2010 - sndirsch@suse.de
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index f1c670a..ed1992e 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -34,7 +34,7 @@ Obsoletes:      xorg-x11-libs-64bit
 #
 Url:            http://xorg.freedesktop.org/
 Version:        7.5
-Release:        1
+Release:        2
 License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -73,7 +73,7 @@ Source90:       baselibs.conf
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
-Patch21:        libxtrap-pcfix.patch
+Patch21:        libXTrap-pcfix.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -219,9 +219,7 @@ Authors:
 %setup -q -T -c %{name}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src
-%if %suse_version > 1010
 %patch2 -p1
-%endif
 popd
 pushd libxkbui-*
 %patch5
@@ -234,35 +232,30 @@ pushd libXTrap-*
 popd
 
 %build
-for dir in xbitmaps-* $(ls | grep -v -e xbitmaps); do
+for dir in $(ls); do
   pushd $dir
-    option=""; echo $dir | grep -q libXvMC && option="--sysconfdir=/etc"
-    case $dir in 
-      *) 
-        echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
-        export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-        %configure \
-%if %suse_version > 1110
-        --disable-static \
-%endif
-        --with-pic --enable-type1 ${option}
-        ;;
+    case $dir in
+      libXvMC-*) option="--sysconfdir=/etc" ;;
+      libvnc*|libXcliplist*) autoreconf -fi ;;
+      *) ;;
     esac
+    export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+    %configure \
+    --disable-static \
+    --with-pic --enable-type1 ${option}
     %{__make} %{?jobs:-j%jobs}
   popd
 done
 
 %install
-for dir in xbitmaps-* $(ls | grep -v xbitmap); do
+for dir in $(ls); do
   pushd $dir
     make install DESTDIR=$RPM_BUILD_ROOT
   popd
 done
 /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
 mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
-%if %suse_version > 1110
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-%endif
 # already in libXext now (same version)
 rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbuf.h
 rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbufstr.h
@@ -277,10 +270,6 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %postun -p /sbin/ldconfig
 
-%pre -n xorg-x11-devel
-test -L usr/include/X11 && rm usr/include/X11
-exit 0
-
 %post -n libpciaccess0 -p /sbin/ldconfig
 
 %postun -n libpciaccess0 -p /sbin/ldconfig
@@ -308,13 +297,8 @@ exit 0
 /usr/include/xcb/
 /usr/%{_lib}/*.so
 %exclude /usr/%{_lib}/libpciaccess.so
-%if %suse_version <= 1110
-/usr/%{_lib}/*.a
-/usr/%{_lib}/*.la
-%endif
 /usr/%{_lib}/pkgconfig/*.pc
 %exclude /usr/%{_lib}/pkgconfig/pciaccess.pc
-#/usr/share/aclocal/*.m4
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %dir %{_datadir}/doc/libXvMC