diff --git a/libbluray-0.2.2-no_doxygen_timestamp.patch b/libbluray-0.2.2-no_doxygen_timestamp.patch
new file mode 100644
index 0000000..8309012
--- /dev/null
+++ b/libbluray-0.2.2-no_doxygen_timestamp.patch
@@ -0,0 +1,22 @@
+--- libbluray-0.2.2/doc/doxygen-config.orig	2012-06-13 02:28:40.042727485 +0200
++++ libbluray-0.2.2/doc/doxygen-config	2012-06-13 01:15:10.457680370 +0200
+@@ -838,7 +838,7 @@
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
+--- libbluray-0.2.2/doc/doxygen-footer.html.orig	2012-06-13 02:25:30.740725465 +0200
++++ libbluray-0.2.2/doc/doxygen-footer.html	2012-06-13 02:25:56.585725752 +0200
+@@ -1,7 +1,7 @@
+ <hr size="1">
+ <div id="footer">
+   <small>
+-    Generated on $datetime for $projectname by&nbsp;
++    Generated for $projectname by&nbsp;
+     <a href="http://www.doxygen.org/index.html">
+     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.1<br />
+     Copyright &copy; 2010 John Stebbins et al.<br />
diff --git a/libbluray.spec b/libbluray.spec
index e7e297c..58522e4 100644
--- a/libbluray.spec
+++ b/libbluray.spec
@@ -8,7 +8,7 @@ Version:        0.2.2
 %if %{snapshot}
 Release:        0.8.%{tarball_date}git%{git_short}%{?dist}
 %else
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        Library to access Blu-Ray disks for video playback 
 Group:          System Environment/Libraries
@@ -23,6 +23,7 @@ Source0:        %{name}-%{tarball_date}git%{git_short}.tar.bz2
 %else
 Source0:        ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
 %endif
+Patch0:         libbluray-0.2.2-no_doxygen_timestamp.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if %{snapshot}
@@ -79,6 +80,7 @@ developing applications that use %{name}.
 %else
 %setup -q
 %endif
+%patch0 -p1 -b .no_timestamp
 
 
 %build
@@ -149,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 12 2012 Xavier Bachelot <xavier@bachelot.org> 0.2.2-2
+- Fix multilib conflict in doxygen docs (RHBZ#831401).
+
 * Tue Mar 20 2012 Xavier Bachelot <xavier@bachelot.org> 0.2.2-1
 - Update to 0.2.2.