diff --git a/gnome-session.changes b/gnome-session.changes
index fcc7d66..a14f0cf 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 24 15:03:23 UTC 2017 - fcrozat@suse.com
+
+- Do not build wayland subpackage on s390/s390x, xwayland doesn't
+  exist there [bsc#1047173].
+
 -------------------------------------------------------------------
 Sat Apr 15 21:19:47 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gnome-session.spec b/gnome-session.spec
index 205e61e..34f7c94 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -78,6 +78,7 @@ Requires:       gnome-shell
 %description default-session
 This package contains the definition of the default GNOME session.
 
+%ifnarch s390 s390x
 %package wayland
 Summary:        Session Manager for GNOME -- Wayland session
 Group:          System/GUI/GNOME
@@ -87,6 +88,7 @@ Requires:       xorg-x11-server-wayland
 
 %description wayland
 This package contains the definition of the default GNOME session on Wayland.
+%endif
 
 %package core
 Summary:        Session Manager for GNOME -- Minimal Version
@@ -128,6 +130,10 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %find_lang %{name}-3.0 %{?no_lang_C}
 %fdupes %{buildroot}
+# remove wayland files on s390/s390x
+%ifarch s390 s390x
+rm -fr %{buildroot}%{_datadir}/wayland-sessions
+%endif
 
 %post
 %desktop_database_post
@@ -156,12 +162,14 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %{_datadir}/gnome-session/sessions/gnome.session
 %{_datadir}/gnome-session/sessions/gnome-dummy.session
 
+%ifnarch s390 s390x
 %files wayland
 %defattr (-, root, root)
 %dir %{_datadir}/wayland-sessions
 %{_datadir}/wayland-sessions/gnome.desktop
 # Disabled as wayland is now the default session again.
 #{_datadir}/wayland-sessions/gnome-wayland.desktop
+%endif
 
 %files core
 %defattr (-, root, root)