diff --git a/mutt.changes b/mutt.changes
index fc21b55..e410256 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar  6 10:37:24 UTC 2017 - werner@suse.de
+
+- Explicite add package documentation directory to file list
+
+-------------------------------------------------------------------
+Thu Mar  2 11:42:45 UTC 2017 - werner@suse.de
+
+- Also now recommend urlscan
+
 -------------------------------------------------------------------
 Wed Nov 23 10:39:04 UTC 2016 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index d7e1506..7cfd66b 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mutt
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -61,6 +61,7 @@ Url:            http://www.mutt.org
 Provides:       muttssl
 Obsoletes:      muttssl
 Recommends:     smtp_daemon
+Recommends:     urlscan
 Recommends:     urlview
 Recommends:     w3m
 %if 0%{?suse_version} > 1130
@@ -263,7 +264,8 @@ install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/
 mkdir -p %{buildroot}%{_datadir}/applications
 install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/
 install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc
-install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap
+install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap
+rm -vf %{buildroot}%{_docdir}/%name/manual.txt
 %suse_update_desktop_file mutt
 
 %if 0%{?suse_version} >= 1140
@@ -277,9 +279,10 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap
 
 %files -f %name.lang
 %defattr(-,root,root)
-%doc doc/manual*.html doc/manual.txt.gz COPYRIGHT README* NEWS TODO
+%doc doc/manual.txt.gz COPYRIGHT README* NEWS TODO
 %doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt
 %config(noreplace) %{_sysconfdir}/skel/.muttrc
+%config(noreplace) %{_sysconfdir}/Muttrc
 %{_bindir}/mutt
 %{_bindir}/pgpewrap
 %{_bindir}/pgpring
@@ -293,8 +296,21 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap
 %{_mandir}/man5/mmdf_mutt.5.gz
 %{_mandir}/man5/muttrc.5.gz
 %{_mandir}/man5/mbox_mutt.5.gz
-%{_datadir}/mutt
+%dir %{_datadir}/mutt/
 %{_datadir}/mutt/mailcap
-%config(noreplace) %{_sysconfdir}/Muttrc
+%doc %{_docdir}/%name/ChangeLog
+%doc %{_docdir}/%name/GPL
+%doc %{_docdir}/%name/*.html
+%doc %{_docdir}/%name/patch-notes.txt
+%dir %doc %{_docdir}/%name/samples/
+%doc %{_docdir}/%name/samples/*.rc
+%doc %{_docdir}/%name/samples/ca-bundle.crt
+%doc %{_docdir}/%name/samples/colors.*
+%dir %doc %{_docdir}/%name/samples/iconv/
+%doc %{_docdir}/%name/samples/iconv/*.rc
+%doc %{_docdir}/%name/samples/mutt_xtitle
+%doc %{_docdir}/%name/samples/sample.*
+%doc %{_docdir}/%name/samples/smime_keys_test.pl
+%doc %{_docdir}/%name/smime-notes.txt
 
 %changelog