diff --git a/.cvsignore b/.cvsignore
index dddd1b7..ddba0b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 alleggl-0.4.2.tar.bz2
+alleggl-doxygen-docs.tar.gz
diff --git a/alleggl.spec b/alleggl.spec
index 48f1dde..f480aa5 100644
--- a/alleggl.spec
+++ b/alleggl.spec
@@ -1,11 +1,14 @@
 Name:           alleggl
 Version:        0.4.2
-Release:        0.2.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        OpenGL support library for Allegro
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://allegrogl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2
+# prebuild doxygen docs to avoid multilib conflicts. To regenerate: untar,
+# cd docs, doxygen Doxyfile, cd .., tar cvfz alleggl-doxygen-docs.tar.gz docs
+Source1:        alleggl-doxygen-docs.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel libGLU-devel libX11-devel libXext-devel
 BuildRequires:  libXpm-devel libXxf86vm-devel doxygen
@@ -34,7 +37,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -a 1 -n %{name}
 
 
 %build
@@ -45,10 +48,6 @@ developing applications that use %{name}.
 make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \
   CFLAGS="$RPM_OPT_FLAGS -ffast-math"
 
-pushd docs
-doxygen Doxyfile
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.4.2-1
+- Upstream has renamed rc1 to final, so drop the .rc1 from the release field
+- Fix multilib conflicts in doxygen documentation (bz 340611)
+
 * Thu Aug  2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.4.2-0.2.rc1
 - Update License tag for new Licensing Guidelines compliance
 
diff --git a/sources b/sources
index 065b452..0de7364 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 e9432c7e29d88252ad65568f3aa3b814  alleggl-0.4.2.tar.bz2
+d3551545c7d17fe2a53aaadf1d3be212  alleggl-doxygen-docs.tar.gz