diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 2ac46d2b64f..bd896ce7387 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.7
-revision=2
+revision=3
 wrksrc="avahi-${version}"
 noarch=yes
 build_style=gnu-configure
@@ -15,9 +15,9 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --with-avahi-priv-access-group=network --with-autoipd-user=avahi
  --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
  --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python --enable-pygtk
+ --disable-static ssp_cv_lib=no --enable-python
  --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection)"
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
 short_desc="Service discover user interface for avahi"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1"
@@ -28,7 +28,7 @@ checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
 hostmakedepends="automake libtool pkg-config intltool pygtk-devel
  python-dbus gobject-introspection glib-devel"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- pygtk-devel python-dbus gtk+3-devel python-gobject-devel"
+ pygtk-devel python-dbus gtk+3-devel $(vopt_if gir python-gobject-devel)"
 depends="avahi>=$version python avahi-python>=$version python-dbus pygtk desktop-file-utils"
 pycompile_module="avahi_discover"
 
@@ -59,7 +59,7 @@ do_install() {
 	vmkdir usr/lib/pkgconfig
 	vmkdir usr/share/avahi/interfaces
 
-	for f in bvnc bssh bshell avahi-bookmarks avahi-discover avahi-discover-standalone; do
+	for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
 		mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
 		if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
 			mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
@@ -161,7 +161,9 @@ avahi-ui-utils_package() {
 		vmove usr/share/applications/bvnc.desktop
 		vmove usr/share/applications/bssh.desktop
 		vmove usr/share/man/man1/bssh.1
-		vmove usr/bin/avahi-discover-standalone
+		if [ "$build_option_gir" ]; then
+			vmove usr/bin/avahi-discover-standalone
+		fi
 		vmove usr/bin/bssh
 		vmove usr/share/man/man1/bvnc.1
 		vmove usr/bin/bvnc