diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index bf97ffd..c42e324 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 14 13:52:36 UTC 2017 - sndirsch@suse.com
+
+- disable Xwayland for s390x again; it was wrong to enable it; 
+  there is no Wayland on s390x and will most likely never exist,
+  since there is no gfx card on such systems and no gfx emulation
+  either (bsc#1047173)
+
 -------------------------------------------------------------------
 Thu Jul 13 13:20:07 UTC 2017 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 58be0fa..42cb871 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -16,11 +16,13 @@
 #
 
 
+%ifarch s390 s390x
+%define have_wayland 0
+%else
 %define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids
 %if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
 %define have_wayland 1
-%else
-%define have_wayland 0
+%endif
 %endif
 
 %define build_suid_wrapper 0