diff --git a/libvorbis.spec b/libvorbis.spec
index fe80410..1cc3af0 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.0
-Release: 	1%{?dist}	
+Release: 	2%{?dist}	
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -51,6 +51,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# create a cleaned up (Makefile free) copy of doc for -devel %doc
+cp -a doc _doc
+rm `find _doc -name 'Makefile*'`
 
 
 %files
@@ -62,7 +65,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files devel
 %defattr(-,root,root)
-%doc doc/*
+%doc _doc/*
 %{_includedir}/vorbis
 %{_libdir}/libvorbis.so
 %{_libdir}/libvorbisfile.so
@@ -78,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 1:1.2.0-2
+- Don't include Makefile's in %doc, avoiding a multilib conflict (bz 342481)
+
 * Mon Oct 15 2007 Behdad Esfahbod <besfahbo@redhat.com> - 1:1.2.0-1
 - Update to 1.2.0
 - Resolves: #250115