diff --git a/common/shlibs b/common/shlibs
index 5349cfbbb85..9469251e5aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -315,7 +315,7 @@ libxfsm-4.6.so.0 xfce4-session-4.9.1_1
 libxklavier.so.16 libxklavier-5.0_1
 libsexy.so.2 libsexy-0.1.11_1
 liblcms.so.1 lcms-1.18_1
-libgd.so.2 gd-2.0.35_1
+libgd.so.3 gd-2.1.0_1
 libcroco-0.6.so.3 libcroco-0.6.2_1
 libgsf-1.so.114 libgsf-1.14.11_1
 libMagickCore.so.5 libmagick-6.7.3.8_1
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 1b0a25e9581..bdeef1a0bc3 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,30 +1,34 @@
 # Template build file for 'gd'.
 pkgname=gd
-version=2.0.35
-revision=10
+version=2.1.0
+revision=1
+wrksrc="libgd-${version}"
 build_style=gnu-configure
-makedepends="pkg-config libXpm-devel libjpeg-turbo-devel libpng-devel>=1.6 fontconfig-devel"
+configure_args="--without-xpm"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel>=1.6 fontconfig-devel"
 short_desc="Graphics library for the dynamic creation of images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libgd.org/"
 license="BSD"
-distfiles="http://jaist.dl.sourceforge.net/project/buluoos/0.1/src/gd-$version.tar.bz2"
-checksum=bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
+distfiles="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${version}.tar.xz"
+checksum=fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a
 
 gd-devel_package() {
-	depends="libXpm-devel libjpeg-turbo-devel fontconfig-devel zlib-devel
-		libpng-devel>=1.6 gd>=${version}"
+	depends="libjpeg-turbo-devel fontconfig-devel zlib-devel libpng-devel>=1.6 gd-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
 		vmove usr/bin/gdlib-config
 	}
 }
 
 gd-progs_package() {
 	depends="perl"
-	short_desc="Utility programs that use libgd"
+	short_desc+=" - utilities"
 	pkg_install() {
 		vmove usr/bin
 	}