diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 7d65a79bc2..7c7a93f458 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=19
+revision=21
 noarch=yes
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -14,7 +14,7 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
  --with-avahi-priv-access-group=network --with-autoipd-user=avahi
  --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --disable-dbm --without-systemdsystemunitdir
  --disable-static ssp_cv_lib=no --enable-python --enable-pygtk
  --enable-glib --enable-gobject --enable-gtk --enable-gtk3
  $(vopt_enable gir introspection)"
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 295a63c823..d14a729d4d 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=20
+revision=21
 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,9 +19,8 @@ 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 $(vopt_if systemd systemd-devel)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
 depends="dbus"
 conf_files="
 	/etc/avahi/services/ssh.service