diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 8eddfcef71d..5ab593ccf1f 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,12 +1,12 @@
 # Template build file for 'gdk-pixbuf'.
 pkgname=gdk-pixbuf
 version=2.28.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png --with-x11"
 hostmakedepends="perl pkg-config"
-makedepends="libglib-devel libpng-devel>=1.6 libjpeg-turbo-devel
- tiff-devel libX11-devel gobject-introspection"
+makedepends="glib-devel libpng-devel>=1.6 libjpeg-turbo-devel
+ tiff-devel libX11-devel"
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -14,6 +14,31 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb
 
+if [ "$CROSS_BUILD" ]; then
+	# needs glib-mkenums
+	hostmakedepends+=" automake libtool gtk-doc gettext-devel glib-devel"
+	configure_args+=" gio_can_sniff=yes"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	makedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 gdk-pixbuf-devel_package() {
 	depends="perl libpng-devel>=1.6 shared-mime-info ${sourcepkg}>=${version}"
 	short_desc+=" - development files"
@@ -22,7 +47,9 @@ gdk-pixbuf-devel_package() {
 		vmove usr/include
 		vmove "usr/bin/*csource*"
 		vmove "usr/share/man/man1/*csource*"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc 
 	}
 }
@@ -30,6 +57,6 @@ gdk-pixbuf-devel_package() {
 gdk-pixbuf_package() {
 	triggers="gtk-pixbuf-loaders"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }