diff --git a/emacs.changes b/emacs.changes
index 2a42a0e..6709eb9 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  7 11:33:27 UTC 2018 - werner@suse.de
+
+- Add configure option for mailutils as recommended by GNU Emacs upstream
+- Re-enable games with GNU Emacs which requires system-user-games 
+
 -------------------------------------------------------------------
 Thu Jun  7 08:14:04 UTC 2018 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index bd4f8c6..5875314 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -18,6 +18,8 @@
 
 %bcond_with     autoconf
 %bcond_without  autoconf
+# Once mailutils is in Factory change this to bcond_without
+%bcond_with     mailutils
 # Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
 %bcond_with     cairo
 
@@ -54,8 +56,12 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libudev-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  m17n-lib-devel
+%if %{with mailutils}
+BuildRequires:  mailutils-devel
+%endif
 BuildRequires:  makeinfo
 BuildRequires:  ncurses-devel
+BuildRequires:  system-user-games
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
@@ -97,6 +103,8 @@ Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
 Requires(pre):  fileutils
+Requires(pre):  group(games)
+Requires(pre):  user(games)
 Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
@@ -396,8 +404,14 @@ fi
 	 --without-libotf \
 	 --without-m17n-flt \
 "
-   COMP="--with-pop \
-	 --without-hesiod \
+   COMP="--without-hesiod \
+%if %{with mailutils}
+	 --without-pop
+	 --with-mailutils
+%else
+	 --with-pop \
+%endif
+	 --with-gameuser=:games \
 	 --with-kerberos \
 	 --with-kerberos5 \
 	 --with-file-notification=inotify \
@@ -647,9 +661,16 @@ fi
 %dir %{_prefix}/lib/emacs/%{version}/
 %dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl
+%if %{without mailutils}
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail
+%endif
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/profile
 %{_prefix}/lib/emacs/%{version}/*-suse-linux*/rcs2log
+%if 0
+%attr(04755,games,games) %{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
+%else
+%{_prefix}/lib/emacs/%{version}/*-suse-linux*/update-game-score
+%endif
 %{_prefix}/lib/systemd/user/emacs.service
 %dir %{_datadir}/doc/packages/emacs/
 %{_datadir}/doc/packages/emacs/doc
@@ -3170,6 +3191,9 @@ fi
 %dir %{_datadir}/emacs/site-lisp/site-start.d/
 %{_mandir}/man1/*.1%{ext_man}
 %exclude %{_mandir}/man1/*tags.1%{ext_man}
+%dir %attr(770,games,games) %{_localstatedir}/games/emacs
+%attr(660,games,games) %{_localstatedir}/games/emacs/snake-scores
+%attr(660,games,games) %{_localstatedir}/games/emacs/tetris-scores
 
 %files       -n emacs-nox
 %defattr(-, root, root)