diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index a2e02162098..1875e109ca1 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -6,7 +6,7 @@
 pkgname=avahi-discover
 version=0.6.31
 wrksrc="avahi-${version}"
-revision=15
+revision=19
 noarch=yes
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -17,15 +17,17 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system
  --disable-static ssp_cv_lib=no --enable-python --enable-pygtk
  --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- --enable-introspection"
+ $(vopt_enable gir introspection)"
 short_desc="Service discover user interface for avahi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://www.avahi.org"
-distfiles="$homepage/download/avahi-$version.tar.gz"
+#distfiles="$homepage/download/avahi-$version.tar.gz"
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/avahi/avahi-${version}.tar.gz/2f22745b8f7368ad5a0a3fddac343f2d/avahi-${version}.tar.gz"
 checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 
-hostmakedepends="automake libtool pkg-config intltool pygtk-devel python-dbus"
+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"
 depends="avahi>=$version python avahi-python>=$version python-dbus pygtk desktop-file-utils"
@@ -39,13 +41,6 @@ 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
-
 pre_configure() {
 	autoreconf -fi
 
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index bc4a5651c77..53d26348544 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=18
+revision=19
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -19,8 +19,9 @@ homepage="http://www.avahi.org"
 distfiles="http://pkgs.fedoraproject.org/repo/pkgs/avahi/avahi-${version}.tar.gz/2f22745b8f7368ad5a0a3fddac343f2d/avahi-${version}.tar.gz"
 checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 
+build_options="systemd"
 hostmakedepends="pkg-config intltool"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel $(vopt_if systemd systemd-devel)"
 depends="dbus"
 conf_files="
 	/etc/avahi/services/ssh.service
@@ -29,13 +30,6 @@ conf_files="
 	/etc/avahi/hosts
 	/etc/avahi/avahi-dnsconfd.action"
 system_accounts="avahi:23"
-replaces="runit-void<20141013_2"
-
-build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
-	systemd_services="avahi-daemon.service on"
-fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool glib-devel"