diff --git a/libusb1.spec b/libusb1.spec
index ea25fa9..9b54104 100644
--- a/libusb1.spec
+++ b/libusb1.spec
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb1
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -18,11 +18,22 @@ this library is not compatible with the original libusb-0.1 series.
 Summary: Development files for libusb
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel-doc = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
-This package contains the header files, libraries  and documentation needed to
-develop applications that use libusb1.
+This package contains the header files and libraries needed to develop
+applications that use libusb1.
+
+%package devel-doc
+Summary: Development files for libusb
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+BuildArch: noarch
+
+%description devel-doc
+This package contains documentation needed to develop applications that
+use libusb1.
 
 %package static
 Summary: Static development files for libusb
@@ -61,16 +72,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%doc doc/html examples/*.c
 %{_libdir}/pkgconfig/libusb-1.0.pc
 %{_includedir}/*
 %{_libdir}/*.so
 
+%files devel-doc
+%defattr(-,root,root)
+%doc doc/html examples/*.c
+
 %files static
 %defattr(-,root,root)
 %{_libdir}/*.a
 
 %changelog
+* Fri Jan 22 2010 Jindrich Novy <jnovy@redhat.com> 1.0.6-2
+- put all doxygen and other docs to separate noarch subpackage to avoid
+  multiarch conflicts (#507980)
+
 * Wed Dec 02 2009 Jindrich Novy <jnovy@redhat.com> 1.0.6-1
 - update to 1.0.6