diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 487b313..cd596a7 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Nov 30 17:18:16 CET 2011 - ro@suse.de
+
+- also package list.h in s390 so that sax2-tools can build
+
+-------------------------------------------------------------------
+Mon Nov 28 16:04:58 CET 2011 - ro@suse.de
+
+- complete s390 fixes 
+
+-------------------------------------------------------------------
+Mon Nov 28 16:02:56 CET 2011 - ro@suse.de
+
+- fix build on s390/s390x 
+
 -------------------------------------------------------------------
 Sun Nov 20 06:49:40 UTC 2011 - coolo@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6d8d150..0b2621d 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -293,14 +293,21 @@ TCP="5801 5901"
 EOF
 %endif
 %ifarch s390 s390x
-rm $RPM_BUILD_ROOT/etc/X11/10-evdev.conf
+rm -f $RPM_BUILD_ROOT/etc/X11/10-evdev.conf
 make -C hw/xfree86/parser
 mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \
          $RPM_BUILD_ROOT/usr/%{_lib}
 install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
          $RPM_BUILD_ROOT/usr/include/xorg
-install -m 644 hw/xfree86/parser/libxf86config.a \
+install -m 644 include/list.h \
+         $RPM_BUILD_ROOT/usr/include/xorg
+if [ -f hw/xfree86/parser/.libs/libxf86config.a ] ; then
+    install -m 644 hw/xfree86/parser/.libs/libxf86config.a \
          $RPM_BUILD_ROOT//usr/%{_lib}
+else
+    install -m 644 hw/xfree86/parser/libxf86config.a \
+         $RPM_BUILD_ROOT//usr/%{_lib}
+fi
 %endif
 %ifnarch s390 s390x
 mkdir -p %buildroot/var/adm/fillup-templates
@@ -372,7 +379,6 @@ exit 0
 /etc/modprobe.d/50-nvidia.conf
 %verify(not mode) /usr/bin/Xorg
 /usr/bin/X
-/usr/bin/Xvfb
 /usr/bin/cvt
 /usr/bin/gtf
 /usr/%{_lib}/xorg/modules/
@@ -381,6 +387,7 @@ exit 0
 /var/adm/fillup-templates/sysconfig.displaymanager-%name
 /var/lib/X11/X
 %endif
+/usr/bin/Xvfb
 /usr/bin/xorg-backtrace
 
 %files extra