diff --git a/srcpkgs/libmediaart/template b/srcpkgs/libmediaart/template
index faa90f1278f..155b99ed6ca 100644
--- a/srcpkgs/libmediaart/template
+++ b/srcpkgs/libmediaart/template
@@ -1,10 +1,10 @@
 # Template file for 'libmediaart'
 pkgname=libmediaart
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool gobject-introspection glib-devel"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel gdk-pixbuf-devel vala-devel"
 short_desc="Media art extraction and cache management library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,6 +13,22 @@ homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c
 
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# 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
+
 libmediaart-devel_package() {
 	depends="libglib-devel gdk-pixbuf-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -20,8 +36,10 @@ libmediaart-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
 		vmove usr/share/gtk-doc
-		vmove usr/share/vala
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }