diff --git a/doxygen-1.4.8-endless-loop.patch b/doxygen-1.4.8-endless-loop.patch
new file mode 100644
index 0000000..a62428b
--- /dev/null
+++ b/doxygen-1.4.8-endless-loop.patch
@@ -0,0 +1,27 @@
+commit 5e056236c9ef3b3675d014cab43480700027d60b
+Author: Dimitri van Heesch <dimitri@stack.nl>
+Date:   Thu May 30 20:01:15 2013 +0200
+
+    Bug 701295 - Doxygen 1.8.4 goes into an endless loop
+
+diff --git a/src/util.cpp b/src/util.cpp
+index 0d70d43..0c36fc0 100644
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name)
+         ++templateDepth;
+         pos=nextOpenPos-1;
+       }
+-      else
++      else if (nextClosePos!=-1)
+       {
+         --templateDepth;
+         pos=nextClosePos-1;
+       }
++      else // more >'s than <'s, see bug701295
++      {
++        return -1;
++      }
+     }
+     else
+     {
diff --git a/doxygen.spec b/doxygen.spec
index 00006b5..ffb46ab 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -2,7 +2,7 @@ Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   1
 Version: 1.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # No version is specified.
 License: GPL+
@@ -15,6 +15,7 @@ Source2: doxywizard.desktop
 Patch1: doxygen-1.8.4-config.patch
 Patch2: doxygen-1.8.1.1-html_timestamp_default_false.patch 
 Patch3: doxygen-1.8.3-multilib.patch
+Patch4: doxygen-1.4.8-endless-loop.patch
 
 BuildRequires: perl
 BuildRequires: tex(dvips)
@@ -62,7 +63,7 @@ Requires: tex(xtab.sty)
 %patch1 -p1 -b .config
 %patch2 -p1 -b .html_timestamp_default_false
 %patch3 -p1 -b .multilib
-
+%patch4 -p1 -b .endless-loop
 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
 touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
@@ -115,6 +116,9 @@ desktop-file-install \
 
 
 %changelog
+* Mon Jun 24 2013 Than Ngo <than@redhat.com> - 1:1.8.4-2
+- backport upstream patch to fix endless loop
+
 * Tue May 21 2013 Than Ngo <than@redhat.com> - 1:1.8.4-1
 - 1.8.4