diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 42008824715..d78b6f9d40b 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,10 +1,10 @@
 # Template build file for 'pango'.
 pkgname=pango
-version=1.36.6
+version=1.36.7
 revision=1
 build_style=gnu-configure
-configure_args="--with-included-modules=basic-fc"
-hostmakedepends="libtool pkg-config glib-devel"
+configure_args="--with-included-modules=basic-fc $(vopt_enable gir introspection)"
+hostmakedepends="libtool pkg-config glib-devel $(vopt_if gir gobject-introspection)"
 # XXX Add missing dependency libthai.
 makedepends="libglib-devel>=2.38 cairo-devel libXft-devel harfbuzz-devel>=0.9.9"
 triggers="pango-modules"
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/pango/1.36/${pkgname}-${version}.tar.xz"
-checksum=4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624
+checksum=1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a
 
 # Package build options
 build_options="gir"
@@ -22,13 +22,6 @@ 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
-
 pre_configure() {
 	libtoolize -f
 }
@@ -43,7 +36,6 @@ pango-xft_package() {
 		fi
 	}
 }
-
 pango-view_package() {
 	replaces="pango<1.36.3_3"
 	short_desc+=" - utility to view pango files"
@@ -52,7 +44,6 @@ pango-view_package() {
 		vmove usr/share/man/man1/pango-view.1
 	}
 }
-
 pango-devel_package() {
 	depends="${makedepends} pango-xft>=${version}_${revision} pango>=${version}_${revision}"
 	short_desc+=" - development files"