diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 2e3472f..dca1db1 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  3 15:36:00 UTC 2015 - msrb@suse.com
+
+- Fix build of s390/s390x (bnc#933503)
+
 -------------------------------------------------------------------
 Sat May 30 04:38:38 UTC 2015 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 36cbb7c..7fef26b 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -296,15 +296,16 @@ autoreconf -fi
             --with-sha1=libcrypto \
             --disable-linux-acpi \
             --disable-linux-apm \
+%ifarch s390 s390x
+            --disable-xwayland \
+            --disable-xorg \
+            --disable-aiglx \
+%else
 %if 0%{?suse_version} > 1310
             --enable-xwayland \
 %else
             --disable-xwayland \
 %endif
-%ifarch s390 s390x
-            --disable-xorg \
-            --disable-aiglx \
-%else
             --enable-xorg \
 %if 0%{?suse_version} > 1120
 	    --enable-config-udev \
@@ -358,11 +359,7 @@ rm -f %{buildroot}%{_datadir}/aclocal/*.m4
 %endif
 %ifarch s390 s390x
 rm -f %{buildroot}%{_sysconfdir}/X11/10-evdev.conf
-make -C hw/xfree86/parser
-mkdir -p %{buildroot}%{_includedir}/xorg \
-         %{buildroot}%{_libdir}
-install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
-         %{buildroot}%{_includedir}/xorg
+mkdir -p %{buildroot}%{_includedir}/xorg
 install -m 644 include/list.h \
          %{buildroot}%{_includedir}/xorg
 %endif