diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 671fd44888f..dd9e93ddcd4 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -2,10 +2,10 @@
 pkgname=glade3
 version=3.16.0
 wrksrc=glade-${version}
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection"
+hostmakedepends="which pkg-config intltool gnome-doc-utils itstool glib-devel"
 makedepends="gtk+3-devel libxml2-devel python-devel pygobject-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="An User Interface Designer for GTK+3"
@@ -14,23 +14,31 @@ license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNOME_SITE}/glade/${version%.*}/glade-$version.tar.xz"
 checksum=b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626
-long_desc="
- Glade is a RAD tool to enable quick &amp; easy development of user interfaces
- for the GTK+ toolkit and the GNOME desktop environment.
 
- The user interfaces designed in Glade are saved as XML, and by using the
- GtkBuilder GTK+ object these can be loaded by applications dynamically as
- needed.
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
 
- By using GtkBuilder, Glade XML files can be used in numerous programming
- languages including C, C++, C#, Vala, Java, Perl, Python and others."
+# 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
 
 libgladeui3_package() {
 	depends="pygobject"
 	short_desc="GTK+ User Interface Build core library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 	}
 }
 
@@ -40,7 +48,9 @@ glade3-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0 
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}