diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 4bc30b7b75..36f3d0b505 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,20 +1,36 @@
 # Template file for 'gupnp'
 pkgname=gupnp
-version=0.20.7
+version=0.20.10
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config gobject-introspection"
-makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel>=0.14.2_2 vala-devel>=0.22"
+hostmakedepends="pkg-config"
+makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel"
 short_desc="GObject-based library for UPnP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://gupnp.org/"
 distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz"
-checksum=ccfa6b04935d81bbcd4aa1f15b6dada977fb32386cf3b99c59a4166067ce3102
+checksum=5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4
+
+# 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 vala-devel>=0.22"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 gupnp-devel_package() {
-	depends="gssdp-devel>=0.14.2_2 glib-devel libxml2-devel libuuid-devel gupnp>=${version}"
+	depends="gssdp-devel glib-devel libxml2-devel libuuid-devel gupnp>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin