diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index 366bde4..28b4033 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -1,6 +1,6 @@
 Name: xmlstarlet
 Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Command Line XML Toolkit
 Group: Applications/Text
 License: MIT
@@ -26,13 +26,13 @@ commands.
 
 %build
 autoreconf -i
-%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 # --libdir=%{_libdir}
+%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} # --libdir=%{_libdir}
 make %{?_smp_mflags}
 
 
 %install
 rm -fr %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
 # Avoid name kludging in autotools
 mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
 
@@ -48,12 +48,15 @@ rm -fr %{buildroot}
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet-ug.html doc/xmlstarlet-ug.ps doc/xmlstarlet-ug.pdf doc/html.css
+%doc AUTHORS ChangeLog NEWS README Copyright TODO
 %{_mandir}/man1/xmlstarlet.1*
 %{_bindir}/xmlstarlet
 
 
 %changelog
+* Sat Jul 27 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.5.0-2
+- Install docs to %%{_pkgdocdir} where available.
+
 * Wed Jul 10 2013 Paul W. Frields <stickster@gmail.com> - 1.5.0-1
 - Update to upstream 1.5.0 (#983025)
 - Fix man page rendering (#981050)