diff --git a/libxcb.spec b/libxcb.spec
index 70e6cdd..a844f72 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -1,3 +1,5 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           libxcb
 Version:        1.9.1
 Release:        2%{?dist}
@@ -52,14 +54,14 @@ The %{name}-doc package contains documentation for the %{name} library.
 %build
 sed -i 's/pthread-stubs //' configure.ac
 autoreconf -v --install
-%configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} \
+%configure --disable-static --docdir=%{_pkgdocdir} \
 	   --enable-selinux --enable-xkb --disable-xprint
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+install -pm 644 COPYING NEWS README $RPM_BUILD_ROOT%{_pkgdocdir}
 sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -105,9 +107,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/%{name}-%{version}
+%{_pkgdocdir}
 
 %changelog
+* Tue Aug  6 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.9.1-2
+- Install docs to %%{_pkgdocdir} where available.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild