diff --git a/mapserver-6.2.1-gdver.patch b/mapserver-6.2.1-gdver.patch
new file mode 100644
index 0000000..0a0b147
--- /dev/null
+++ b/mapserver-6.2.1-gdver.patch
@@ -0,0 +1,12 @@
+--- mapserver-6.2.1/configure.gdver	2013-04-20 06:08:49.000000000 +0200
++++ mapserver-6.2.1/configure	2013-06-11 10:51:24.478483434 +0200
+@@ -17135,7 +17135,8 @@
+ 
+ 
+ 
+-      if test $GDMAJOR -lt 2 -o $GDMINOR -lt 0 -o $GDREV -lt 28 ; then
++      GDNUM=`expr ${GDMAJOR}0000 + ${GDMINOR}00 + ${GDREV}`
++      if test $GDNUM -lt 20028 ; then
+          as_fn_error $? "GD version $GDVERSION too old. need at least 2.0.28" "$LINENO" 5
+       fi
+ 
diff --git a/mapserver.spec b/mapserver.spec
index b514335..0868356 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -2,7 +2,7 @@
 
 Name:           mapserver%{MS_REL}
 Version:        6.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 
 Group:          Development/Tools
@@ -15,6 +15,8 @@ Patch0:         %{name}-%{version}-java-%{MS_REL}.patch
 Patch1:         %{name}-%{version}-perl-%{MS_REL}.patch
 Patch2:         %{name}-%{version}-python-%{MS_REL}.patch
 %endif
+# Fix check for libgd version (to be reported upstream)
+Patch3:         %{name}-6.2.1-gdver.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,6 +91,8 @@ within the Java programming language.
 %patch1 -p1 -b .perl
 %patch2 -p1 -b .python
 %endif
+%patch3 -p1 -b .gdver
+
 # fix spurious perm bits
 chmod -x mapscript/python/examples/*.py
 chmod -x mapscript/python/tests/rundoctests.dist
@@ -282,6 +286,9 @@ chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_R
 %{_libdir}/libjavamapscript-%{version}.so
 
 %changelog
+* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> - 6.2.1-2
+- rebuild for new GD 2.1.0
+
 * Tue May 21 2013 Pavel Lisý <pali@fedoraproject.org> - 6.2.1-1
 - Update to latest stable release
 - BZ 910689 - dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts