diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 11c1aff8580..a7e5b610ea9 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.30
-revision=2
+revision=3
 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -23,7 +23,7 @@ long_desc="
 
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
-openrc_services="avahi-daemon default true avahi-dnsconfd default true"
+systemd_services="avahi-daemon.service avahi-dnsconfd.service"
 conf_files="/etc/avahi/avahi-daemon.conf /etc/avahi/hosts.conf"
 
 subpackages="$pkgname-autoipd $pkgname-discover $pkgname-compat-libs"
@@ -56,3 +56,8 @@ Add_dependency build pygtk-devel
 Add_dependency build dbus-python
 Add_dependency build gtk+3-devel
 Add_dependency build gobject-introspection
+
+post_install()
+{
+	rm -rf ${DESTDIR}/etc/init.d
+}