diff --git a/.gitignore b/.gitignore
index 943fe53..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/epstopdf-2.9.5gw
 /*.tar.gz
diff --git a/globus-gsi-cert-utils-ac.patch b/globus-gsi-cert-utils-ac.patch
deleted file mode 100644
index 4faee89..0000000
--- a/globus-gsi-cert-utils-ac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur globus_gsi_cert_utils-8.3.orig/configure.in globus_gsi_cert_utils-8.3/configure.in
---- globus_gsi_cert_utils-8.3.orig/configure.in	2012-02-13 15:43:32.000000000 +0100
-+++ globus_gsi_cert_utils-8.3/configure.in	2013-02-27 18:45:19.699865853 +0100
-@@ -11,7 +11,7 @@
- 
- LAC_DOXYGEN(["../library"])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- GLOBUS_OPENSSL
- 
diff --git a/globus-gsi-cert-utils-doxygen.patch b/globus-gsi-cert-utils-doxygen.patch
deleted file mode 100644
index 9f87971..0000000
--- a/globus-gsi-cert-utils-doxygen.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur globus_gsi_cert_utils-8.3.orig/library/globus_gsi_cert_utils.c globus_gsi_cert_utils-8.3/library/globus_gsi_cert_utils.c
---- globus_gsi_cert_utils-8.3.orig/library/globus_gsi_cert_utils.c	2011-01-28 03:21:23.000000000 +0100
-+++ globus_gsi_cert_utils-8.3/library/globus_gsi_cert_utils.c	2013-07-28 05:35:34.727503477 +0200
-@@ -887,7 +887,7 @@
-  *
-  * @param cert_chain
-  *    Certificate chain to inspect.
-- * @param eec
-+ * @param identity_cert
-  *    Pointer to be set to the certificate value from within the cert chain.
-  *    Must freed by the caller.
-  */
diff --git a/globus-gsi-cert-utils.spec b/globus-gsi-cert-utils.spec
index 9e8beb3..0fda24c 100644
--- a/globus-gsi-cert-utils.spec
+++ b/globus-gsi-cert-utils.spec
@@ -8,21 +8,16 @@
 
 Name:		globus-gsi-cert-utils
 %global _name %(tr - _ <<< %{name})
-Version:	8.3
-Release:	7%{?dist}
+Version:	8.6
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Cert Utils Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GSIC
-#		This is a workaround for the broken epstopdf script in RHEL5
-#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source9:	epstopdf-2.9.5gw
-Patch0:		%{name}-ac.patch
-Patch1:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-gsi-proxy-ssl%{?_isa} >= 4
@@ -121,19 +116,8 @@ Globus GSI Cert Utils Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
-%patch1 -p1
-
-%if "%{rhel}" == "5"
-mkdir bin
-install %{SOURCE9} bin/epstopdf
-%endif
 
 %build
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
 # Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
@@ -154,10 +138,6 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 make %{?_smp_mflags}
 
 %install
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
@@ -210,6 +190,12 @@ rm -rf %{buildroot}
 %dir %{_pkgdocdir}/html
 
 %changelog
+* Wed Nov 06 2013 Mattias Ellert <mattias.ellert@fysast.uu.se> - 8.6-1
+- Update to Globus Toolkit 5.2.5
+- Drop patches globus-gsi-cert-utils-ac.patch and
+  globus-gsi-cert-utils-doxygen.patch (accepted upstream)
+- Remove obsolete workaround for broken RHEL 5 epstopdf
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8849eea..e5ed9c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-b2e619b261ef8b2a5b84d2aebacfa564  globus_gsi_cert_utils-8.3.tar.gz
+09cabe2cbce4c4e2f4f995ce1345bc7a  globus_gsi_cert_utils-8.6.tar.gz