diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 562925d1807..b414ccd146f 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -1,15 +1,15 @@
 # Template file for 'avahi-compat-libs-devel'.
 #
-depends="avahi-libs-devel>=$version avahi-compat-libs>=$version"
+depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
 short_desc="Avahi compat libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
+noarch=yes
+
 do_install() {
 	vmove "usr/include/avahi-compat*" usr/include
-	vmove usr/lib/libhowl.a usr/lib
-	vmove usr/lib/libdns_sd.a usr/lib
 	vmove "usr/lib/pkgconfig/avahi-compat*" usr/lib/pkgconfig
 }
diff --git a/srcpkgs/avahi/avahi-compat-libs.rshlibs b/srcpkgs/avahi/avahi-compat-libs.rshlibs
index 7bb7cb0ab07..be99ae8565f 100644
--- a/srcpkgs/avahi/avahi-compat-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-compat-libs.rshlibs
@@ -1,7 +1,5 @@
 libavahi-client.so.3
-libdbus-1.so.3
-libpthread.so.0
 libavahi-common.so.3
-libdl.so.2
 libssp.so.0
+libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 93bd9629515..7d5fb0037e8 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -1,14 +1,15 @@
 # Template file for 'avahi-glib-libs-devel'.
 #
-depends="avahi-libs-devel>=$version avahi-glib-libs>=$version"
+depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}"
 short_desc="Avahi glib libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the glib libraries
  provided by Avahi."
 
+noarch=yes
+
 do_install() {
 	vmove "usr/include/avahi-g*" usr/include
-	vmove "usr/lib/libavahi-g*.a" usr/lib
 	vmove "usr/lib/pkgconfig/avahi-g*" usr/lib/pkgconfig
 }
diff --git a/srcpkgs/avahi/avahi-glib-libs.rshlibs b/srcpkgs/avahi/avahi-glib-libs.rshlibs
index 0619460f0d3..7687f951d86 100644
--- a/srcpkgs/avahi/avahi-glib-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-glib-libs.rshlibs
@@ -1,9 +1,6 @@
-libavahi-client.so.3
-libdbus-1.so.3
-libpthread.so.0
-libdl.so.2
 libavahi-common.so.3
-libgobject-2.0.so.0
 libglib-2.0.so.0
-libssp.so.0
+libpthread.so.0
 libc.so.6
+libavahi-client.so.3
+libgobject-2.0.so.0
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index 600e38aafbf..511027d7565 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -1,16 +1,17 @@
 # Template file for 'avahi-libs-devel'.
 #
-depends="glibc-devel libssp-devel dbus-devel avahi-libs>=$version"
+depends="libssp-devel dbus-devel avahi-libs-${version}_${revision}"
 short_desc="Avahi core libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the core libraries
  provided by Avahi."
 
+noarch=yes
+
 do_install() {
 	for f in common client core; do
 		vmove usr/include/avahi-${f} usr/include
-		vmove usr/lib/libavahi-${f}.a usr/lib
 	done
 	vmove usr/lib/pkgconfig/avahi-core.pc usr/lib/pkgconfig
 	vmove usr/lib/pkgconfig/avahi-client.pc usr/lib/pkgconfig
diff --git a/srcpkgs/avahi/avahi-libs.rshlibs b/srcpkgs/avahi/avahi-libs.rshlibs
index 6d851acae9d..c42bf9eedc5 100644
--- a/srcpkgs/avahi/avahi-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-libs.rshlibs
@@ -1,5 +1,5 @@
 libdbus-1.so.3
-libpthread.so.0
 libdl.so.2
 libssp.so.0
+libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 345b194d1a9..7e2872830c6 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -1,14 +1,17 @@
 # Template file for 'avahi-ui-libs-devel'.
 #
-depends="gtk+-devel gtk+3-devel avahi-libs-devel>=$version avahi-ui-libs>=$version avahi-ui-libs-gtk3>=$version"
+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)"
 long_desc="${long_desc}
 
  This package contains development files for the UI libraries
  provided by Avahi."
 
+noarch=yes
+
 do_install() {
 	vmove "usr/include/avahi-ui*" usr/include
-	vmove "usr/lib/libavahi-ui*" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs b/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs
index 4e7ea8b697f..df4e4c05e86 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs
@@ -1,20 +1,11 @@
 libavahi-client.so.3
-libdbus-1.so.3
-libpthread.so.0
-libdl.so.2
 libavahi-glib.so.1
 libavahi-common.so.3
 libgtk-3.so.0
 libgdk-3.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangocairo-1.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
-libcairo.so.2
-libpango-1.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
-libssp.so.0
-libc.so.6
 libgdbm.so.4
+libssp.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/avahi/avahi-ui-libs.rshlibs b/srcpkgs/avahi/avahi-ui-libs.rshlibs
index ddc48215fdd..d38ae5683fa 100644
--- a/srcpkgs/avahi/avahi-ui-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-ui-libs.rshlibs
@@ -1,22 +1,11 @@
 libavahi-client.so.3
-libdbus-1.so.3
-libpthread.so.0
-libdl.so.2
 libavahi-glib.so.1
 libavahi-common.so.3
 libgtk-x11-2.0.so.0
 libgdk-x11-2.0.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangoft2-1.0.so.0
-libpangocairo-1.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo.so.2
-libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libgobject-2.0.so.0
 libglib-2.0.so.0
-libssp.so.0
-libc.so.6
 libgdbm.so.4
+libssp.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/avahi/avahi-ui-utils.rshlibs b/srcpkgs/avahi/avahi-ui-utils.rshlibs
index a8902f0c4b5..5450470cc30 100644
--- a/srcpkgs/avahi/avahi-ui-utils.rshlibs
+++ b/srcpkgs/avahi/avahi-ui-utils.rshlibs
@@ -1,11 +1,11 @@
+libavahi-client.so.3
 libavahi-common.so.3
-libavahi-glib.so.1
-libavahi-core.so.7
+libavahi-ui-gtk3.so.0
 libgtk-3.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libssp.so.0
 libpthread.so.0
 libc.so.6
-libavahi-client.so.3
-libavahi-ui-gtk3.so.0
+libavahi-glib.so.1
+libavahi-core.so.7
diff --git a/srcpkgs/avahi/avahi-utils.rshlibs b/srcpkgs/avahi/avahi-utils.rshlibs
index b2a57585102..910e0a3b28c 100644
--- a/srcpkgs/avahi/avahi-utils.rshlibs
+++ b/srcpkgs/avahi/avahi-utils.rshlibs
@@ -1,6 +1,6 @@
 libavahi-client.so.3
-libpthread.so.0
 libavahi-common.so.3
-libssp.so.0
-libc.so.6
 libgdbm.so.4
+libssp.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/avahi/avahi.rshlibs b/srcpkgs/avahi/avahi.rshlibs
index 6469f85c06c..3cf66859a55 100644
--- a/srcpkgs/avahi/avahi.rshlibs
+++ b/srcpkgs/avahi/avahi.rshlibs
@@ -5,6 +5,6 @@ libexpat.so.1
 libcap.so.2
 libdl.so.2
 libdbus-1.so.3
-libpthread.so.0
 libssp.so.0
+libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 6331a5d54eb..ea9bcb3bc33 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,18 +1,15 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
---disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
---with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
---with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
---with-autoipd-group=avahi --with-distro=none --disable-xmltoman
---disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system"
-depends="dbus"
-makedepends="pkg-config intltool libssp-devel dbus-devel libcap-devel
-libdaemon-devel gdbm-devel expat-devel pygtk-devel dbus-python
-gtk+3-devel gobject-introspection"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
+ --disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --disable-static"
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -26,9 +23,16 @@ long_desc="
  a network and instantly find printers to print to, files to look at and
  people to talk to."
 
+depends="dbus"
+
+makedepends="pkg-config intltool libssp-devel dbus-devel libcap-devel
+ libdaemon-devel gdbm-devel expat-devel dbus-python pygtk-devel
+ gtk+3-devel>=3.6.0_5 gobject-introspection"
+
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
 systemd_services="avahi-daemon.service on"
+
 conf_files="
 /etc/avahi/services/ssh.service
 /etc/avahi/services/sftp-ssh.service
@@ -36,7 +40,7 @@ conf_files="
 /etc/avahi/hosts
 /etc/avahi/avahi-dnsconfd.action"
 
-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"
+subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-devel
+ avahi-libs avahi-libs-devel avahi-glib-libs avahi-glib-libs-devel
+ avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils
+ avahi-ui-utils avahi-python-utils avahi-python"