diff --git a/srcpkgs/giblib-devel b/srcpkgs/giblib-devel
new file mode 120000
index 0000000000..e27abc3f61
--- /dev/null
+++ b/srcpkgs/giblib-devel
@@ -0,0 +1 @@
+giblib
\ No newline at end of file
diff --git a/srcpkgs/giblib/depends b/srcpkgs/giblib/depends
new file mode 100644
index 0000000000..55813ed4c8
--- /dev/null
+++ b/srcpkgs/giblib/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.2.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/giblib/giblib-devel.template b/srcpkgs/giblib/giblib-devel.template
new file mode 100644
index 0000000000..88e3f089b7
--- /dev/null
+++ b/srcpkgs/giblib/giblib-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'giblib-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run imlib2-devel
+Add_dependency run freetype-devel
+Add_dependency run zlib-devel
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run glibc-devel
+Add_dependency run giblib
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/giblib/template b/srcpkgs/giblib/template
new file mode 100644
index 0000000000..b1cc0ca553
--- /dev/null
+++ b/srcpkgs/giblib/template
@@ -0,0 +1,34 @@
+# Template build file for 'giblib'
+pkgname=giblib
+version=1.2.4
+distfiles="http://linuxbrit.co.uk/downloads/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+make_install_args="docsdir=/usr/share/doc/giblib"
+short_desc="Programming utility library"
+maintainer="Mike Rosset <mike.rosset@gmail.com>"
+homepage="http://linuxbrit.co.uk/giblib/"
+license="MIT"
+checksum=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac
+long_desc="
+ Giblib is a utility library used by many of the applications found on
+ www.linuxbrit.co.uk. It incorporates doubly linked lists, some string
+ functions, and a wrapper for imlib2. The wrapper does two things. It
+ gives you access to fontstyles, which can be loaded from files, saved to
+ files, or defined dynamically through the API. It also, and more
+ importantly, wraps imlib2's context API into a more compact form."
+
+subpackages="$pkgname-devel"
+
+Add_dependency run imlib2
+Add_dependency run freetype
+Add_dependency run zlib
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run glibc
+Add_dependency build pkg-config
+Add_dependency build imlib2-devel
+Add_dependency build freetype-devel
+Add_dependency build zlib-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build glibc-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 489e5ded87..468b29d2cd 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -812,3 +812,4 @@ libogrove.so			openjade		openjade-devel
 libospgrove.so			openjade		openjade-devel
 libostyle.so			openjade		openjade-devel
 libtorrent.so.14		libtorrent		libtorrent-devel
+libgiblib.so			giblib			giblib-devel