diff --git a/hwloc.spec b/hwloc.spec
index ce5eb23..bf1fea0 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,7 +1,7 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   1.8
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
@@ -69,9 +69,8 @@ chmod 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
 # We don't ship .la files.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-mv %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cp -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}
+cp -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}
 
 %check
 make check
@@ -93,7 +92,7 @@ make check
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_includedir}/%{name}.h
-%{_defaultdocdir}/%{name}-%{version}/*c
+%{_defaultdocdir}/%{name}/*c
 %{_libdir}/*.so
 
 %files libs
@@ -101,12 +100,16 @@ make check
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}.dtd
 %{_datadir}/%{name}/%{name}-valgrind.supp
-%dir %{_defaultdocdir}/%{name}-%{version}
-%{_defaultdocdir}/%{name}-%{version}/*[^c]
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/*[^c]
 %{_libdir}/libhwloc*so.*
 
 
 %changelog
+* Sat Jan 04 2014 Jirka Hladky <hladky.jiri@gmail.com> - 1.8-2
+- Unversioned docdir change, more info on 
+  https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+
 * Thu Dec 19 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.8-1
 - Update to 1.8
 - No numa on aarch64