diff --git a/buildbot.spec b/buildbot.spec
index df2067d..b3d45c1 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -1,5 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 %global do_tests 1
 
 # The master and slave packages have (in theory) an independent versioning
@@ -7,7 +9,7 @@
 
 Name:           buildbot
 Version:        0.8.7p1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Build/test automation system
 Group:          Development/Tools
@@ -145,7 +147,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/ \
          %{buildroot}%{_mandir}/man1/ \
-         %{buildroot}%{_docdir}/%{name}-%{version}
+         %{buildroot}%{_pkgdocdir}
 
 cp -R contrib %{buildroot}/%{_datadir}/%{name}/
 
@@ -153,7 +155,7 @@ cp -R contrib %{buildroot}/%{_datadir}/%{name}/
 cp docs/buildbot.1 %{buildroot}%{_mandir}/man1/buildbot.1
 
 # install HTML documentation
-tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_docdir}/%{name}-%{version}
+tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_pkgdocdir}
 
 # clean up Windows contribs.
 sed -i 's/\r//' %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
@@ -190,10 +192,13 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+%{_pkgdocdir}
 
 
 %changelog
+* Mon Aug 05 2013 Gianluca Sforna <giallu@gmail.com> - 0.8.7p1-2
+- Install docs to %%{_pkgdocdir} where available.
+
 * Sun Jul 28 2013 Gianluca Sforna <giallu@gmail.com> - 0.8.7p1-1
 - New upstream release
 - Require python-dateutil