diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 3cfd90c694e..0cdd84bf28c 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,12 +1,12 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
  --disable-orbit --enable-gsettings-backend --disable-static"
 conf_files="/etc/gconf/2/path"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="libtool pkg-config intltool glib-devel"
 makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 short_desc="A process-transparent configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,6 +15,26 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
 
+# 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
+
+pre_configure() {
+	libtoolize -f
+}
+
 post_install() {
 	# Create GCONF_SCHEMAS_DIR
 	vmkdir usr/share/gconf/schemas
@@ -33,7 +53,9 @@ GConf-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/sgml
 		vmove usr/share/aclocal
 		vmove usr/share/gtk-doc