diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template
index 075354a05c3..59b3a3ef088 100644
--- a/srcpkgs/mash/template
+++ b/srcpkgs/mash/template
@@ -1,10 +1,10 @@
 # Template file for 'mash'
 pkgname=mash
 version=0.2.0
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--enable-introspection --disable-static"
-hostmakedepends="pkg-config intltool gobject-introspection"
+configure_args="--disable-static $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="clutter-devel"
 depends="clutter>=1.18"
 short_desc="A small library for using 3D models within a Clutter scene"
@@ -14,8 +14,13 @@ license="LGPL-2.1"
 distfiles="https://github.com/downloads/clutter-project/mash/mash-${version}.tar.xz"
 checksum=fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc
 
+build_options="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
 mash-devel_package() {
-	depends="clutter-devel>=1.18 mash>=${version}_${revision}"
+	depends="${makedepends} mash>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include