diff --git a/sord.spec b/sord.spec
index bd754dd..a440d82 100644
--- a/sord.spec
+++ b/sord.spec
@@ -1,8 +1,9 @@
 %global maj 0
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:       sord
 Version:    0.12.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A lightweight Resource Description Framework (RDF) C library
 
 Group:      System Environment/Libraries
@@ -49,7 +50,7 @@ export CFLAGS="%{optflags}"
     --libdir=%{_libdir} \
     --mandir=%{_mandir} \
     --datadir=%{_datadir} \
-    --docdir=%{_docdir}/%{name}-devel-%{version} \
+    --docdir=%{_pkgdocdir} \
     --test \
     --docs 
 ./waf build -v %{?_smp_mflags}
@@ -57,27 +58,32 @@ export CFLAGS="%{optflags}"
 %install
 DESTDIR=%{buildroot} ./waf install
 chmod +x %{buildroot}%{_libdir}/lib%{name}-%{maj}.so.*
+install -pm 644 AUTHORS NEWS README COPYING %{buildroot}%{_pkgdocdir}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS NEWS README COPYING
+%{_pkgdocdir}
+%exclude %{_pkgdocdir}/%{name}-%{maj}/
 %{_libdir}/lib%{name}-%{maj}.so.*
 %{_bindir}/sordi
 %{_bindir}/sord_validate
-%{_mandir}/man1/sordi.1.gz
+%{_mandir}/man1/%{name}*.1*
 
 %files devel
+%{_pkgdocdir}/%{name}-%{maj}/
 %{_libdir}/lib%{name}-%{maj}.so
 %{_libdir}/pkgconfig/%{name}-%{maj}.pc
 %{_includedir}/%{name}-%{maj}/
-%{_docdir}/%{name}-devel-%{version}
-%{_mandir}/man1/%{name}*.1.*
-%{_mandir}/man3/%{name}*.3.*
+%{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Sun Dec 15 2013 Ville Skyttä <ville.skytta@iki.fi> - 0.12.0-4
+- Install docs to %%{_pkgdocdir} where available (#994099).
+- Move *.1 manpages to main package.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild