diff --git a/hwloc.spec b/hwloc.spec
index 139599c..6e22820 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,13 +1,11 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   1.11.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2
-# Updated test file for patch below
-Source1:   https://github.com/open-mpi/hwloc/raw/7a9b00834235ddd3c02699cbab7946edf6fc9030/tests/linux/32ppc-4n4c2c.tar.bz2
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: cairo-devel
@@ -79,7 +77,6 @@ Requires:  %{name}-plugins%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q
-cp -a %SOURCE1 tests/linux/
 
 %build
 # Remove rpaths
@@ -123,14 +120,14 @@ make check
 %{_includedir}/%{name}.h
 %{_defaultdocdir}/%{name}/examples
 %{_libdir}/*.so
-
-%files libs
 %{_mandir}/man7/%{name}*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}.dtd
 %{_datadir}/%{name}/%{name}-valgrind.supp
 %dir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}/*[^c]
+
+%files libs
 %{_libdir}/libhwloc*so.5*
 
 %files gui
@@ -143,6 +140,9 @@ make check
 %{_libdir}/hwloc*
 
 %changelog
+* Tue Aug 18 2015 Jirka Hladky <hladky.jiri@gmail.com> - 1.10.0-2
+- Moved all doc files from lib to devel subpackage to allow i686 and x86_64 libraries to be installed alongside
+
 * Tue Jul 21 2015 Orion Poplwski <orion@cora.nwra.com> - 1.11.0-1
 - Update to version 1.11.0 (fixes bug #1208279)
 - Drop arm patch applied upstream