diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 36626c2626..48509479bc 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -1,18 +1,18 @@
 # Template file for 'grilo'
 pkgname=grilo
-version=0.2.11
+version=0.2.12
 revision=1
 build_style=gnu-configure
-configure_args="--enable-vala --disable-static --libdir=/usr/lib"
-hostmakedepends="libtool pkg-config intltool vala-devel>=0.24"
-makedepends="vala-devel>=0.24 gtk+3-devel>=3.8 libxml2-devel
- libsoup-devel>=2.44 liboauth-devel totem-pl-parser-devel"
+configure_args="--disable-static $(vopt_enable gir introspection)"
+hostmakedepends="libtool pkg-config intltool
+ $(vopt_if gir 'vala-devel>=0.24 gobject-introspection')"
+makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel totem-pl-parser-devel"
 short_desc="Framework focused on making media discovery and browsing easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://live.gnome.org/Grilo"
 distfiles="${GNOME_SITE}/$pkgname/0.2/$pkgname-$version.tar.xz"
-checksum=8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6
+checksum=55b4663550bc8185f8db232e96b9ba99fbfa9175e31e7321fa5ccaacf3617b85
 
 # Package build options
 build_options="gir"
@@ -22,27 +22,20 @@ 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
 }
 
 grilo-devel_package() {
-	depends="gtk+3-devel libxml2-devel libsoup-devel>=2.44 grilo>=${version}_${revision}"
+	depends="${makedepends} grilo>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		if [ "$build_option_gir" ]; then
+			vmove "usr/share/vala*/*"
 			vmove usr/share/gir-1.0
 		fi
 		vmove usr/lib/pkgconfig
-		vmove "usr/share/vala*/*"
 		vmove "usr/lib/*.so"
 	}
 }