diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 144c3c2ce3..da6e3d0fda 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=4
+revision=5
 homepage="http://www.avahi.org"
 distfiles="$homepage/download/avahi-$version.tar.gz"
 build_style=gnu-configure
@@ -26,7 +26,7 @@ long_desc="
 
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
-systemd_services="avahi-daemon.socket on"
+systemd_services="avahi-daemon.service on"
 conf_files="
 /etc/avahi/services/ssh.service
 /etc/avahi/services/sftp-ssh.service
@@ -34,11 +34,7 @@ conf_files="
 /etc/avahi/hosts
 /etc/avahi/avahi-dnsconfd.action"
 
-subpackages="$pkgname-autoipd $pkgname-discover $pkgname-compat-libs"
-subpackages="$subpackages $pkgname-compat-libs-devel $pkgname-libs"
-subpackages="$subpackages $pkgname-libs-devel $pkgname-glib-libs"
-subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs"
-subpackages="$subpackages $pkgname-ui-libs-gtk3"
-subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
-subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
-subpackages="$subpackages $pkgname-python"
+subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-devel"
+subpackages="$subpackages avahi-libs avahi-libs-devel avahi-glib-libs avahi-glib-libs-devel"
+subpackages="$subpackages avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils"
+subpackages="$subpackages avahi-ui-utils avahi-python-utils avahi-python"