diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index 3912e7e1035..b7412f1dfcc 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -1,12 +1,12 @@
 # Template file for 'udisks2'
 pkgname=udisks2
 version=2.1.1
-revision=1
+revision=2
 wrksrc="udisks-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-udevdir=/usr/lib/udev
 --with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool gobject-introspection libxslt docbook-xsl"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
 makedepends="acl-devel device-mapper-devel liblvm2app-devel libparted-devel
  libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel systemd-devel"
 make_dirs="/var/lib/udisks2 0750 root root"
@@ -17,14 +17,32 @@ license="GPL-2"
 distfiles="http://udisks.freedesktop.org/releases/udisks-${version}.tar.bz2"
 checksum=013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb
 
+# 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"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 udisks2-devel_package() {
-	depends="libglib-devel udisks2>=$version"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 	}
 }