diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 77fdd90c923..7e35a50a702 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -1,10 +1,10 @@
 # Template file for 'gupnp-dlna'
 pkgname=gupnp-dlna
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config gobject-introspection"
+hostmakedepends="pkg-config"
 makedepends="gst-plugins-base1-devel vala-devel>=0.20"
 short_desc="GUPnP DLNA"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,9 +12,22 @@ license="LGPL-2.1"
 homepage="http://gupnp.org/"
 distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
 checksum=158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3
-long_desc="
- UPnP DLNA is a small utility library that aims to ease the DLNA-related tasks
- such as media profile guessing, transcoding to a given profile, etc."
+
+# 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
 
 gupnp-dlna-devel_package() {
 	depends="gst-plugins-base1-devel ${sourcepkg}>=${version}"
@@ -22,8 +35,10 @@ gupnp-dlna-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/gtk-doc
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 		vmove usr/lib/pkgconfig
 	}
 }