diff --git a/lilv.spec b/lilv.spec
index a94441f..aeab85e 100644
--- a/lilv.spec
+++ b/lilv.spec
@@ -1,8 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global maj 0
 
 Name:       lilv
 Version:    0.16.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    An LV2 Resource Description Framework Library
 
 Group:      System Environment/Libraries
@@ -60,7 +61,7 @@ sed -i -e "s|'-ftest-coverage'\]|\
 export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 ./waf configure -v --prefix=%{_prefix}\
  --libdir=%{_libdir} --configdir=%{_sysconfdir} --mandir=%{_mandir}\
- --docdir=%{_docdir}/%{name}-devel-%{version}\
+ --docdir=%{_pkgdocdir}\
  --docs --test --dyn-manifest --bindings 
 ./waf -v build %{?_smp_mflags}
 
@@ -77,6 +78,7 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 
 %files
 %doc AUTHORS NEWS README COPYING
+%exclude %{_pkgdocdir}/%{name}-%{maj}/
 %{_libdir}/lib%{name}-%{maj}.so.*
 %{_bindir}/lilv-bench
 %{_bindir}/lv2info
@@ -90,7 +92,7 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 %{_libdir}/lib%{name}-%{maj}.so
 %{_libdir}/pkgconfig/%{name}-%{maj}.pc
 %{_includedir}/%{name}-%{maj}/
-%{_docdir}/%{name}-devel-%{version}
+%{_pkgdocdir}/%{name}-%{maj}/
 %{_mandir}/man3/*
 
 %files -n python-%{name}
@@ -98,6 +100,9 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 %{python_sitearch}/_%{name}.so
 
 %changelog
+* Thu Nov 28 2013 Ville Skyttä <ville.skytta@iki.fi> - 0.16.0-3
+- Install docs to (main, not devel) %%{_pkgdocdir} where available (#993969).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild