diff --git a/srcpkgs/libmediaart2/template b/srcpkgs/libmediaart2/template
index 554cbe61074..a20de4544b0 100644
--- a/srcpkgs/libmediaart2/template
+++ b/srcpkgs/libmediaart2/template
@@ -1,18 +1,20 @@
 # Template file for 'libmediaart2'
 pkgname=libmediaart2
 version=1.9.0
-revision=1
+revision=2
+wrksrc="libmediaart-$version"
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gdk-pixbuf-devel vala-devel"
+configure_args="--disable-schemas-compile
+ $(vopt_if gir '--enable-vala --enable-introspection' '--disable-vala --disable-introspection')"
+hostmakedepends="pkg-config intltool glib-devel
+ $(vopt_if gir 'vala-devel gobject-introspection')"
+makedepends="libglib-devel gdk-pixbuf-devel"
 short_desc="Media art extraction and cache management library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/libmediaart/${version%.*}/libmediaart-$version.tar.xz"
 checksum=94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f
-wrksrc=libmediaart-$version
 
 # Package build options
 build_options="gir"
@@ -22,15 +24,8 @@ 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
-
 libmediaart2-devel_package() {
-	depends="libglib-devel gdk-pixbuf-devel ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include