diff --git a/bibus.spec b/bibus.spec
index 7957b31..dc2b7b4 100644
--- a/bibus.spec
+++ b/bibus.spec
@@ -1,8 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global debug_package %{nil}
 
 Name:           bibus
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
@@ -70,19 +71,21 @@ make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc \
 rm $RPM_BUILD_ROOT%{_bindir}/bibus
 ln -s %{_datadir}/%{name}/bibusStart.py $RPM_BUILD_ROOT%{_bindir}/bibus
 
-## fix location of doc directory to include version
-mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-
 ## also install ScreenShots subdirectory, missed by Makefile
-install -d $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/html/ScreenShots/
-install -m644 Docs/html/ScreenShots/*.png $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/html/ScreenShots/
+install -d $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ScreenShots/
+install -m644 Docs/html/ScreenShots/*.png $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ScreenShots/
+
+if [ "%{_datadir}/doc/%{name}" != "%{_pkgdocdir}" ]; then
+    ## fix location of doc directory to include version
+    mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+
+    ## fix bibus.cfg to fix documentation location
+    sed -i "s:doc/bibus:doc/bibus-%{version}:" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg
+fi
 
 ## fix bibus.cfg to remove $RPM_BUILD_ROOT
 sed -i "s:$RPM_BUILD_ROOT::" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg
 
-## fix bibus.cfg to fix documentation location
-sed -i "s:doc/bibus:doc/bibus-%{version}:" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg
-
 ## remove uninstall program, not necessary for RPM package
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Setup/uninstall.sh
 
@@ -94,7 +97,7 @@ desktop-file-install \
 %{find_lang} %{name}
 
 %files -f %{name}.lang
-%doc %{_datadir}/doc/%{name}-%{version}
+%doc %{_pkgdocdir}
 %{_bindir}/bibus
 %{_datadir}/%{name}
 %{_datadir}/applications/*
@@ -103,6 +106,10 @@ desktop-file-install \
 %config(noreplace) %{_sysconfdir}/*
 
 %changelog
+* Sat Jan 18 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.5.1-11
+- Adapt to unversioned docdirs where applicable (#993684).
+- Fix bogus date in %%changelog.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -167,9 +174,8 @@ desktop-file-install \
 * Thu Mar 13 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-3
 - Fix desktop-file-install as per review (#436619)
 
-* Wed Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-2
+* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-2
 - Require sqlite for sqlite backend
 
 * Sat Mar  8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-1
 - Initial Fedora package
-