diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 88b3f5cdf9c..79a22295c3f 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -2,7 +2,6 @@
 #
 depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
 short_desc="Avahi compat libraries -- development files"
-noarch=yes
 
 do_install() {
 	vmove "usr/include/avahi-compat*" usr/include
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 228658e5906..c4a122a6f08 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -2,7 +2,6 @@
 #
 depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}"
 short_desc="Avahi glib libraries -- development files"
-noarch=yes
 
 do_install() {
 	vmove "usr/include/avahi-g*" usr/include
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index e2a5b2901a0..5b95c21f4e3 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -1,8 +1,7 @@
 # Template file for 'avahi-libs-devel'.
 #
-depends="libssp-devel dbus-devel avahi-libs-${version}_${revision}"
+depends="dbus-devel avahi-libs-${version}_${revision}"
 short_desc="Avahi core libraries -- development files"
-noarch=yes
 
 do_install() {
 	for f in common client core; do
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 333ed91d9f6..c4760b0d873 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -4,7 +4,6 @@ depends="gtk+-devel gtk+3-devel avahi-libs-devel-${version}_${revision}
  avahi-ui-libs-${version}_${revision} avahi-ui-libs-gtk3-${version}_${revision}"
 
 short_desc="Avahi UI libraries -- development files"
-noarch=yes
 
 do_install() {
 	vmove "usr/include/avahi-ui*" usr/include
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index bae8b058a46..0cfb7ba3076 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -22,7 +22,6 @@ hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel dbus-python pygtk-devel
  gtk+3-devel>=3.6.0_5 gobject-introspection"
 
-# Create avahi and netdev system accounts.
 systemd_services="avahi-daemon.service on"
 
 conf_files="