diff --git a/srcpkgs/gdk-pixbuf-devel b/srcpkgs/gdk-pixbuf-devel
new file mode 120000
index 00000000000..fa20dc708aa
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf-devel
@@ -0,0 +1 @@
+gdk-pixbuf
\ No newline at end of file
diff --git a/srcpkgs/gdk-pixbuf/depends b/srcpkgs/gdk-pixbuf/depends
new file mode 100644
index 00000000000..59002e41cfa
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.22.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
new file mode 100644
index 00000000000..66a962ba3f2
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
@@ -0,0 +1,31 @@
+# Template file for 'gdk-pixbuf-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="
+ ${pkgname} is An image loading library for GTK+.
+
+ This package contains development files: headers, static libs, etc."
+
+replaces="gtk+-devel<2.22"
+
+Add_dependency run perl
+Add_dependency run pkg-config
+Add_dependency run glib-devel
+Add_dependency run libpng-devel
+Add_dependency run jpeg-devel
+Add_dependency run tiff-devel
+Add_dependency run libX11-devel
+Add_dependency run gdk-pixbuf
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/{bin,include,lib}
+	install -d ${DESTDIR}/usr/share/man/man1
+
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/bin/*csource* ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/share/man/man1/*csource* \
+		${DESTDIR}/usr/share/man/man1
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/gdk-pixbuf/patches/gdk-pixbuf-query-loaders-new-option.diff b/srcpkgs/gdk-pixbuf/patches/gdk-pixbuf-query-loaders-new-option.diff
new file mode 100644
index 00000000000..e42712f1209
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/patches/gdk-pixbuf-query-loaders-new-option.diff
@@ -0,0 +1,41 @@
+Implement --print-cache-file option to print the path to the
+cache file used by gdk-pixbuf.
+
+--- docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1.orig	2010-10-23 15:38:09.302070058 +0200
++++ docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1	2010-10-23 15:39:56.156994937 +0200
+@@ -7,7 +7,7 @@
+ .\"    Source: [FIXME: source]
+ .\"  Language: English
+ .\"
+-.TH "GDK\-PIXBUF\-QUERY\-" "1" "09/21/2010" "[FIXME: source]" "[FIXME: manual]"
++.TH "GDK\-PIXBUF\-QUERY\-" "1" "10/23/2010" "[FIXME: source]" "[FIXME: manual]"
+ .\" -----------------------------------------------------------------
+ .\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+@@ -59,6 +59,11 @@ gdk\-pixbuf
+ at the file\&.
+ .SH "OPTIONS"
+ .PP
++\-\-print\-cache\-file
++Prints the full path to the default cache file to stdout.
++.RS 4
++.RE
++.PP
+ \-\-update\-cache
+ .RS 4
+ Write the output to the default cache location instead of
+--- gdk-pixbuf/queryloaders.c.orig	2010-10-23 15:34:28.360421197 +0200
++++ gdk-pixbuf/queryloaders.c	2010-10-23 15:36:27.509779280 +0200
+@@ -283,7 +283,11 @@ int main (int argc, char **argv)
+ 
+ #endif
+ 
+-        if (argc > 1 && strcmp (argv[1], "--update-cache") == 0) {
++	if (argc > 1 && strcmp (argv[1], "--print-cache-file") == 0) {
++		cache_file = gdk_pixbuf_get_module_file ();
++		printf ("%s\n", cache_file);
++		return 0;
++	} else if (argc > 1 && strcmp (argv[1], "--update-cache") == 0) {
+                 cache_file = gdk_pixbuf_get_module_file ();
+                 first_file = 2;
+         }
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
new file mode 100644
index 00000000000..b257679f73c
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/template
@@ -0,0 +1,30 @@
+# Template build file for 'gdk-pixbuf'.
+pkgname=gdk-pixbuf
+version=2.22.0
+distfiles="${GNOME_SITE}/$pkgname/2.22/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--without-libjasper --with-included-loaders=png"
+short_desc="An Image loading library for The GTK+ toolkit (v2)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=b8ff6a308f037af6b501246ad8779a951ca92af975efc2e97c354ea6702667cf
+long_desc="
+ This package contains an image loading library for the GTK+ toolkit v2."
+
+# gtk+<2.22 included gdk-pixbuf.
+replaces="gtk+<2.22"
+triggers="gtk-pixbuf-loaders"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libpng
+Add_dependency run jpeg
+Add_dependency run tiff
+Add_dependency run libX11
+Add_dependency build perl
+Add_dependency build pkg-config
+Add_dependency build glib-devel
+Add_dependency build libpng-devel
+Add_dependency build jpeg-devel
+Add_dependency build tiff-devel
+Add_dependency build libX11-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 0a2e887c48e..3821973c4da 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -82,9 +82,9 @@ libpangox-1.0.so		pango			pango-devel
 libpango-1.0.so			pango			pango-devel
 libcairo.so			cairo			cairo-devel
 libgdk-x11-2.0.so		gtk+			gtk+-devel
-libgdk_pixbuf-2.0.so		gtk+			gtk+-devel
 libgtk-x11-2.0.so		gtk+			gtk+-devel
-libgdk_pixbuf_xlib-2.0.so	gtk+			gtk+-devel
+libgdk_pixbuf-2.0.so		gdk-pixbuf		gdk-pixbuf-devel
+libgdk_pixbuf_xlib-2.0.so	gdk-pixbuf		gdk-pixbuf-devel
 libgailutil.so.18		gtk+			gtk+-devel
 libfreetype.so			freetype		freetype-devel
 libfontconfig.so		fontconfig		fontconfig-devel
@@ -647,3 +647,4 @@ libmtp.so			libmtp			libmtp-devel
 libelf.so			libelf			libelf-devel
 libgtksourceview-2.0.so		gtksourceview		gtksourceview-devel
 libtalloc.so			talloc			talloc-devel
+libmount.so			libmount		libmount-devel