diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 34027d3e5a..f8ec408ca8 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -1,9 +1,9 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
 version=0.5.3
-revision=3
-hostmakedepends="perl pkg-config intltool"
-makedepends="gobject-introspection gtk+-devel gtk+3-devel gnutls-devel libsasl-devel vala-devel python-devel pygtk-devel"
+revision=4
+hostmakedepends="perl pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)"
+makedepends="gtk+-devel gtk+3-devel gnutls-devel libsasl-devel vala-devel python-devel pygtk-devel"
 short_desc="VNC viewer widget for GTK"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
@@ -11,6 +11,11 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=d490a6c8f40e550d43aef0043ce3bec498ec220d5eb3dc5cdcff8fd561149caf
 
+build_options="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
 post_extract() {
 	cp -a ${wrksrc} /tmp/gtk2-build
 	cp -a ${wrksrc} /tmp/gtk3-build
@@ -19,10 +24,12 @@ post_extract() {
 
 do_configure() {
 	cd ${wrksrc}/gtk2-build
-	./configure ${configure_args} --with-python --disable-static --with-gtk=2.0
+	./configure ${configure_args} --with-python --disable-static \
+		--with-gtk=2.0 $(vopt_enable gir introspection)
 
 	cd ${wrksrc}/gtk3-build
-	./configure ${configure_args} --with-python --disable-static --with-gtk=3.0
+	./configure ${configure_args} --with-python --disable-static \
+		--with-gtk=3.0 $(vopt_enable gir introspection)
 }
 
 do_build() {
@@ -45,7 +52,9 @@ gtk2-vnc_package() {
 	short_desc+=" - GTK+2 port"
 	pkg_install() {
 		vmove "usr/lib/libgtk-vnc-1.0.so*"
-		vmove usr/lib/girepository-1.0/GtkVnc-1.0.typelib
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0/GtkVnc-1.0.typelib
+		fi
 	}
 }
 
@@ -55,7 +64,9 @@ gtk2-vnc-devel_package() {
 	pkg_install() {
 		vmove usr/include/gtk-vnc-1.0
 		#vmove usr/share/vala/vapi/gtk-vnc-1.0.vapi
-		vmove usr/share/gir-1.0/GtkVnc-1.0.gir
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0/GtkVnc-1.0.gir
+		fi
 		vmove usr/lib/pkgconfig/gtk-vnc-1.0.pc
 	}
 }
@@ -78,8 +89,10 @@ gtk-vnc-devel_package() {
 		vmove usr/share/vala/vapi/gtk-vnc-2.0.deps
 		vmove usr/share/vala/vapi/gtk-vnc-2.0.vapi
 		vmove usr/share/vala/vapi/gvnc-1.0.vapi
-		vmove usr/share/gir-1.0/GVnc-1.0.gir
-		vmove usr/share/gir-1.0/GtkVnc-2.0.gir
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0/GVnc-1.0.gir
+			vmove usr/share/gir-1.0/GtkVnc-2.0.gir
+		fi
 		vmove usr/lib/*.so
 	}
 }