diff --git a/icewm.changes b/icewm.changes
index e552f30..2e31b49 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 17 14:19:38 UTC 2017 - fvogt@suse.com
+
+- Use update-alternatives to create default.desktop xsession (boo#1030873)
+
 -------------------------------------------------------------------
 Wed Feb 22 10:19:04 UTC 2017 - okurz@suse.com
 
diff --git a/icewm.spec b/icewm.spec
index 3124758..27d2a64 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -70,6 +70,8 @@ Requires:       xterm-bin
 %else
 Requires:       xterm
 %endif
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 # If you have the choice, prefer the big one.
 Recommends:     icewm-default
 Recommends:     icewm-lang = %{version}
@@ -223,9 +225,21 @@ for file in %{lites}; do
 done
 
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/icewm.desktop
+
+touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
+ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
+
 # Link duplicate theme icons to save some space.
 %fdupes %{buildroot}%{_datadir}/icewm/themes/
 
+%post
+%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
+  default-xsession.desktop %{_datadir}/xsessions/icewm.desktop 15
+
+%postun
+[ -f %{_datadir}/xsessions/icewm.desktop ] || %{_sbindir}/update-alternatives \
+  --remove default-xsession.desktop %{_datadir}/xsessions/icewm.desktop
+
 %post lite
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/icewm       icewm         %{_bindir}/icewm-lite 0       \
@@ -255,8 +269,11 @@ fi
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/icewm
+%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 %{_datadir}/icewm/
-%{_datadir}/xsessions/*
+%{_datadir}/xsessions/icewm-session.desktop
+%{_datadir}/xsessions/icewm.desktop
+%ghost %{_datadir}/xsessions/default.desktop
 %{_mandir}/man1/icewm.1%{?ext_man}
 
 %files config-upstream