diff --git a/givaro-doc-no-build-time.patch b/givaro-doc-no-build-time.patch
index 639908a..5604fea 100644
--- a/givaro-doc-no-build-time.patch
+++ b/givaro-doc-no-build-time.patch
@@ -1,3 +1,8 @@
+From: dmitry_r@opensuse.org
+Date: Thu May 23 16:16:10 UTC 2013
+
+Delete timestamp from documentation.
+
 Index: givaro-3.7.2/docs/Doxyfile.mod
 ===================================================================
 --- givaro-3.7.2.orig/docs/Doxyfile.mod
diff --git a/givaro.changes b/givaro.changes
index dc3423d..62cd43a 100644
--- a/givaro.changes
+++ b/givaro.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Oct 11 18:46:20 UTC 2014 - jengelh@inai.de
+
+- Require a minimum doxygen version for proper symlink handling
+  as used during givaro build.
+- Move patch description to the patch.
+
 -------------------------------------------------------------------
 Sat Aug  9 23:28:11 UTC 2014 - jengelh@inai.de
 
diff --git a/givaro.spec b/givaro.spec
index 7207024..e218982 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package givaro
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,7 +11,7 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -25,10 +25,11 @@ Summary:        C++ library for arithmetic and algebraic computations
 License:        CECILL-B
 Group:          Productivity/Scientific/Math
 Url:            http://givaro.forge.imag.fr/
-Source:         http://forge.imag.fr/frs/download.php/370/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE givaro-doc-no-build-time.patch -- Delete timestamp from documentation
+
+Source:         http://forge.imag.fr/frs/download.php/370/%name-%version.tar.gz
 Patch1:         givaro-doc-no-build-time.patch
-BuildRequires:  doxygen
+# Old doxygen does not properly handle symlink recursion
+BuildRequires:  doxygen >= 1.5.7.1
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel >= 3.1.1
@@ -112,8 +113,7 @@ make %{?_smp_mflags}
 b="%buildroot";
 make install DESTDIR="$b";
 rm -f "$b/%_libdir"/*.la;
-
-%fdupes -s %{buildroot}/%{_docdir}/%{name}/givaro-html/
+%fdupes -s %buildroot/%_docdir/%name/givaro-html/
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -135,7 +135,7 @@ rm -f "$b/%_libdir"/*.la;
 %files doc
 %defattr(-,root,root)
 %dir %_docdir/%name/
-%exclude %{_docdir}/%{name}/givaro-html/INSTALL
+%exclude %_docdir/%name/givaro-html/INSTALL
 %_docdir/%name/givaro.html
 %_docdir/%name/givaro-html/