diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 2f6320fd78..649e7e0acf 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,13 +1,12 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.34.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-included-modules=basic-fc"
 hostmakedepends="pkg-config"
 # XXX Add missing dependency libthai.
-makedepends="libglib-devel>=2.36 cairo-devel libXft-devel
- harfbuzz-devel>=0.9.9 gobject-introspection"
+makedepends="glib-devel>=2.36 cairo-devel libXft-devel harfbuzz-devel>=0.9.9"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
@@ -15,14 +14,40 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/pango/1.34/${pkgname}-${version}.tar.xz"
 checksum=105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27
 
+if [ "$CROSS_BUILD" ]; then
+	# needs glib-mkenums
+	hostmakedepends+=" automake libtool gtk-doc glib-devel"
+	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
+
 pango-devel_package() {
 	depends="libglib-devel cairo-devel fontconfig-devel freetype-devel
 		libXft-devel harfbuzz-devel pango-${version}_${revision}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/share/gir-*"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 		vmove usr/share/gtk-doc
 	}
 }
@@ -31,6 +56,6 @@ pango_package() {
 	depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91"
 	triggers="pango-modules"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }