diff --git a/gnome-session.changes b/gnome-session.changes
index c1b16ff..03ef156 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 26 16:44:00 CET 2018 - ro@suse.de
+
+- Fix build on s390/s390x without wayland: do not setup the system
+  for default-waylandsession alternatives.
+
 -------------------------------------------------------------------
 Sun Dec 24 15:19:46 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gnome-session.spec b/gnome-session.spec
index be03ff3..7252df5 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-session
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -20,7 +20,7 @@ Name:           gnome-session
 Version:        3.26.1
 Release:        0
 Summary:        Session Tools for the GNOME Desktop
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-session/3.26/%{name}-%{version}.tar.xz
@@ -125,7 +125,7 @@ translation-update-upstream
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 # install startup script and xsession file
 install -d -m755 %{buildroot}%{_bindir}
 install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
@@ -143,8 +143,10 @@ rm -fr %{buildroot}%{_datadir}/wayland-sessions
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
 ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
+%ifnarch s390 s390x
 touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
 ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
+%endif
 
 %post
 %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
@@ -155,7 +157,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
   --remove default-xsession.desktop %{_datadir}/xsessions/gnome.desktop
 
 %files
-%defattr (-, root, root)
 %{_bindir}/gnome
 %{_datadir}/xsessions/default.desktop
 %{_datadir}/xsessions/gnome.desktop
@@ -163,7 +164,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 
 %files default-session
-%defattr (-, root, root)
 %{_datadir}/gnome-session/sessions/gnome.session
 %{_datadir}/gnome-session/sessions/gnome-dummy.session
 
@@ -177,7 +177,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
   --remove default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop
 
 %files wayland
-%defattr (-, root, root)
 %dir %{_datadir}/wayland-sessions
 %{_datadir}/wayland-sessions/default.desktop
 %{_datadir}/wayland-sessions/gnome.desktop
@@ -187,8 +186,8 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %endif
 
 %files core
-%defattr (-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_bindir}/gnome-session
 %{_bindir}/gnome-session-inhibit
 %{_bindir}/gnome-session-quit
@@ -208,6 +207,5 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %{_datadir}/gnome-session/hardware-compatibility
 
 %files lang -f %{name}-3.0.lang
-%defattr(-,root,root)
 
 %changelog