diff --git a/media-libs/gd/gd-2.1.0.recipe b/media-libs/gd/gd-2.1.0.recipe
deleted file mode 100644
index 7761a4e60..000000000
--- a/media-libs/gd/gd-2.1.0.recipe
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY="A library for the dynamic creation of images"
-DESCRIPTION="GD is an open source library for the dynamic creation of images \
-by programmers."
-HOMEPAGE="http://www.libgd.org"
-SOURCE_URI="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-2.1.0.tar.xz"
-CHECKSUM_SHA256="fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a"
-REVISION="2"
-COPYRIGHT="1999-2013 Pierre-Alain Joye"
-LICENSE="Libgd"
-
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	gd = $portVersion
-	cmd:gd
-	"
-REQUIRES="
-	haiku
-	lib:libpng
-	lib:libjpeg
-	lib:libgif
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:autoconf
-	cmd:aclocal
-	cmd:cmake
-	cmd:gcc
-	cmd:libtoolize
-	cmd:make
-	"
-
-SOURCE_DIR="libgd-$portVersion"
-
-BUILD()
-{
-	echo libdir=$libDir
-	libtoolize --force --copy --install
-	aclocal -I config
-	autoconf
-	automake
-	runConfigure ./configure
-	make
-}
-
-INSTALL()
-{
-	make install
-}
diff --git a/media-libs/gd/gd-2.1.1.recipe b/media-libs/gd/gd-2.1.1.recipe
new file mode 100644
index 000000000..ffa615211
--- /dev/null
+++ b/media-libs/gd/gd-2.1.1.recipe
@@ -0,0 +1,91 @@
+SUMMARY="A library for the dynamic creation of images"
+DESCRIPTION="GD is an open source library for the dynamic creation of images \
+by programmers."
+HOMEPAGE="http://www.libgd.org"
+SOURCE_URI="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-$portVersion.tar.xz"
+SOURCE_DIR="libgd-$portVersion"
+CHECKSUM_SHA256="9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285"
+COPYRIGHT="1999-2015 Pierre-Alain Joye"
+LICENSE="Libgd"
+REVISION="1"
+
+ARCHITECTURES="!x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	gd$secondaryArchSuffix = $portVersion
+	cmd:annotate$secondaryArchSuffix
+	cmd:bdftogd$secondaryArchSuffix
+	cmd:gd$secondaryArchSuffix
+	cmd:gd2copypal$secondaryArchSuffix
+	cmd:gd2togif$secondaryArchSuffix
+	cmd:gd2topng$secondaryArchSuffix
+	cmd:gdcmpgif$secondaryArchSuffix
+	cmd:gdlib_config$secondaryArchSuffix
+	cmd:gdparttopng$secondaryArchSuffix
+	cmd:gdtopng$secondaryArchSuffix
+	cmd:giftogd2$secondaryArchSuffix
+	cmd:pngtogd$secondaryArchSuffix
+	cmd:pngtogd2$secondaryArchSuffix
+	cmd:webpng$secondaryArchSuffix
+	lib:libgd$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix}
+	lib:libbz2$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libvpx$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+PROVIDES_devel="
+	gd${secondaryArchSuffix}_devel = $portVersion
+	devel:libgd$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel
+	gd$secondaryArchSuffix == $portVersion base
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libfontconfig$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libvpx$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:autoconf
+	cmd:aclocal
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:which
+	"
+
+BUILD()
+{
+	bootstrap.sh
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/*.la
+	prepareInstalledDevelLibs \
+		libgd
+	packageEntries devel \
+		$developDir
+}