diff --git a/dia.changes b/dia.changes
index 70efb0a..c8863b7 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb 21 10:57:57 UTC 2017 - badshah400@gmail.com
+
+- Avoid double inclusion of the contents of the directory
+  %{_docdir}/%{name}, by removing it from the file-list for
+  main package.
+
+-------------------------------------------------------------------
+Fri Feb 10 11:14:17 UTC 2017 - badshah400@gmail.com
+
+- Make sure to own %{_docdir}/%{name} and lower directories
+  individually by using %doc/%dir wherever appropriate.
+
 -------------------------------------------------------------------
 Fri Feb  3 13:51:06 UTC 2017 - badshah400@gmail.com
 
diff --git a/dia.spec b/dia.spec
index 2b645f6..7fd34bc 100644
--- a/dia.spec
+++ b/dia.spec
@@ -138,7 +138,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO samples/ font-test*dia
+%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO
 %{_bindir}/*
 %{_libdir}/dia
 %dir %{_datadir}/appdata
@@ -146,15 +146,30 @@ fi
 %{_datadir}/applications/*.desktop
 %{_datadir}/dia
 %{_datadir}/icons/hicolor/*/apps/dia.*
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/en/
+%dir %{_docdir}/%{name}/html
 %doc %{_docdir}/%{name}/html/en
 # EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en
-%doc %{_docdir}/%{name}/*/examples/
+%doc %{_docdir}/%{name}/*/examples
 %doc %{_mandir}/man1/*.*
 
 %files lang -f %{name}.lang
 %defattr(-,root,root)
+%exclude %{_docdir}/%{name}/AUTHORS
+%exclude %{_docdir}/%{name}/COPYING
+%exclude %{_docdir}/%{name}/ChangeLog
+%exclude %{_docdir}/%{name}/KNOWN_BUGS
+%exclude %{_docdir}/%{name}/NEWS
+%exclude %{_docdir}/%{name}/README
+%exclude %{_docdir}/%{name}/TODO
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/html
+%exclude %{_docdir}/%{name}/en
+%doc %{_docdir}/%{name}/*
+%exclude %{_docdir}/%{name}/html/en
+%exclude %{_docdir}/%{name}/*/examples
 %doc %{_docdir}/%{name}/html/*
 %doc %{_mandir}/fr/man1/*.*
-%exclude %{_docdir}/%{name}/html/en
 
 %changelog