diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
index dd4b7995611..20a05d4b711 100644
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@@ -1,16 +1,25 @@
 # Template file for 'clutter-gtk'
 pkgname=clutter-gtk
-version=1.5.4
+version=1.6.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool gobject-introspection"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
 makedepends="gtk+3-devel clutter-devel>=1.18"
 short_desc="GTK+3 bindings for the Clutter Tolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://clutter-project.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=db9c710ea3970620278c58d0bc522018353a75c83ac6ad60e272d2532533e772
+checksum=883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d
+
+# Package build options
+build_options="gir"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
 
 clutter-gtk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -19,7 +28,9 @@ clutter-gtk-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0 
 		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }