diff --git a/q.spec b/q.spec
index e225c39..116ba09 100644
--- a/q.spec
+++ b/q.spec
@@ -1,6 +1,6 @@
 Name: 		q
 Version: 	7.11
-Release: 	16%{?dist}
+Release: 	17%{?dist}
 Summary: 	Equational programming language
 Group: 		Development/Languages
 License: 	GPLv2+
@@ -104,9 +104,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/q/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/q-%{version}
-mv $RPM_BUILD_ROOT%{_datadir}/q/etc $RPM_BUILD_ROOT%{_docdir}/q-%{version}
-mv $RPM_BUILD_ROOT%{_datadir}/q/examples $RPM_BUILD_ROOT%{_docdir}/q-%{version}
+mkdir -p _docs_staging
+mv $RPM_BUILD_ROOT%{_datadir}/q/etc _docs_staging
+mv $RPM_BUILD_ROOT%{_datadir}/q/examples _docs_staging
 
 
 %post
@@ -129,8 +129,7 @@ fi
 %{_libdir}/q
 %{_mandir}/man*/*
 %{_datadir}/q
-%{_docdir}/q-%{version}
-%docdir %{_docdir}/q-%{version}/
+%doc _docs_staging/*
 %exclude %{_libdir}/q/dxl.so
 %exclude %{_datadir}/q/lib/dxl.q
 %exclude %{_libdir}/q/curl.so
@@ -168,6 +167,9 @@ fi
 
 
 %changelog
+* Fri Aug  2 2013 Ville Skyttä <ville.skytta@iki.fi> - 7.11-17
+- Use special %%doc to install docs.
+
 * Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> - 7.11-16
 - Rebuild for broken deps in rawhide