diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template
index 246fcd0f3c..7650ee9325 100644
--- a/srcpkgs/avahi/avahi-autoipd.template
+++ b/srcpkgs/avahi/avahi-autoipd.template
@@ -10,9 +10,7 @@ long_desc="${long_desc}
  server. It is primarily intended to be used in ad-hoc networks which lack a
  DHCP server."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/sbin/avahi-autoipd usr/sbin
 	vmove "usr/share/man/man8/avahi-autoipd*" usr/share/man/man8
 	vmove etc/avahi/avahi-autoipd.action etc/avahi
diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index d1f2ff3307..562925d180 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'avahi-compat-libs-devel'.
 #
-depends="avahi-libs-devel avahi-compat-libs"
+depends="avahi-libs-devel>=$version avahi-compat-libs>=$version"
 short_desc="Avahi compat libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
-
-
-do_install()
-{
+do_install() {
 	vmove "usr/include/avahi-compat*" usr/include
 	vmove usr/lib/libhowl.a usr/lib
 	vmove usr/lib/libdns_sd.a usr/lib
diff --git a/srcpkgs/avahi/avahi-compat-libs.rshlibs b/srcpkgs/avahi/avahi-compat-libs.rshlibs
index e825bcac6d..7bb7cb0ab0 100644
--- a/srcpkgs/avahi/avahi-compat-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-compat-libs.rshlibs
@@ -1,7 +1,6 @@
 libavahi-client.so.3
 libdbus-1.so.3
 libpthread.so.0
-librt.so.1
 libavahi-common.so.3
 libdl.so.2
 libssp.so.0
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index 8fddf15968..ddfa5a7bf1 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,10 +6,7 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
-
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libhowl.so*" usr/lib
 	vmove "usr/lib/libdns_sd.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index 77f2a902f8..a10ff3a39e 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/srcpkgs/avahi/avahi-discover.template
@@ -1,6 +1,6 @@
 # Template file for 'avahi-discover'.
 #
-depends="avahi python avahi-python dbus-python pygtk desktop-file-utils"
+depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
 short_desc="Service discover user interface for avahi"
 long_desc="${long_desc}
 
@@ -9,8 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 pycompile_module="avahi_discover"
 
-
-
 do_install() {
 	vmove usr/bin/avahi-discover usr/bin
 	vmove "usr/share/man/man1/avahi-discover*" usr/share/man/man1
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 406cdbebd3..93bd962951 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -1,15 +1,13 @@
 # Template file for 'avahi-glib-libs-devel'.
 #
-depends="avahi-libs-devel avahi-glib-libs"
+depends="avahi-libs-devel>=$version avahi-glib-libs>=$version"
 short_desc="Avahi glib libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the glib libraries
  provided by Avahi."
 
-
-do_install()
-{
+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 71bd3cbe87..0619460f0d 100644
--- a/srcpkgs/avahi/avahi-glib-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-glib-libs.rshlibs
@@ -4,7 +4,6 @@ libpthread.so.0
 libdl.so.2
 libavahi-common.so.3
 libgobject-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libssp.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index 1083d17a70..2a09e5bae7 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,10 +5,7 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
-
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libavahi-glib.so*" usr/lib
 	vmove "usr/lib/libavahi-gobject.so*" usr/lib
 	vmove "usr/lib/girepository*" usr/lib
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index 090286fa0a..600e38aafb 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'avahi-libs-devel'.
 #
-depends="glibc-devel libssp-devel dbus-devel avahi-libs"
+depends="glibc-devel libssp-devel dbus-devel avahi-libs>=$version"
 short_desc="Avahi core libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the core libraries
  provided by Avahi."
 
-
-
-do_install()
-{
+do_install() {
 	for f in common client core; do
 		vmove usr/include/avahi-${f} usr/include
 		vmove usr/lib/libavahi-${f}.a usr/lib
diff --git a/srcpkgs/avahi/avahi-libs.rshlibs b/srcpkgs/avahi/avahi-libs.rshlibs
index 1e726451ee..6d851acae9 100644
--- a/srcpkgs/avahi/avahi-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-libs.rshlibs
@@ -1,6 +1,5 @@
 libdbus-1.so.3
 libpthread.so.0
-librt.so.1
 libdl.so.2
 libssp.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 0e71c4863f..2790dabe5e 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -1,15 +1,11 @@
 # Template file for 'avahi-libs'.
 #
-depends="gdbm"
 short_desc="Avahi shared libraries"
 long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
-
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libavahi-client.so*" usr/lib
 	vmove "usr/lib/libavahi-core.so*" usr/lib
 	vmove "usr/lib/libavahi-common.so*" usr/lib
diff --git a/srcpkgs/avahi/avahi-python-utils.template b/srcpkgs/avahi/avahi-python-utils.template
index 770115e6a5..3b82590e3f 100644
--- a/srcpkgs/avahi/avahi-python-utils.template
+++ b/srcpkgs/avahi/avahi-python-utils.template
@@ -1,16 +1,13 @@
 # Template file for 'avahi-python-utils'.
 #
-depends="avahi-python"
+noarch=yes
+depends="avahi-python>=$version"
 short_desc="Avahi python utils"
 long_desc="${long_desc}
 
  This package contains the python utilities provided by Avahi."
 
-
-noarch=yes
-
-do_install()
-{
+do_install() {
 	vmove usr/bin/avahi-bookmarks usr/bin
 	vmove "usr/share/man/man1/avahi-bookmarks*" usr/share/man/man1
 }
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index 56393e6456..1156412e6d 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/srcpkgs/avahi/avahi-python.template
@@ -9,8 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 pycompile_module="avahi"
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/python*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 75843572db..345b194d1a 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'avahi-ui-libs-devel'.
 #
-depends="glibc-devel gtk+-devel gtk+3-devel gdbm-devel avahi-libs-devel avahi-ui-libs avahi-ui-libs-gtk3"
+depends="gtk+-devel gtk+3-devel avahi-libs-devel>=$version avahi-ui-libs>=$version avahi-ui-libs-gtk3>=$version"
 short_desc="Avahi UI libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the UI libraries
  provided by Avahi."
 
-
-
-do_install()
-{
+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 75f61e1786..4e7ea8b697 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.rshlibs
@@ -14,7 +14,6 @@ libcairo-gobject.so.2
 libcairo.so.2
 libpango-1.0.so.0
 libgobject-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libssp.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
index 8547151252..159ef2a603 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the GTK+3 UI shared libraries provided by Avahi."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libavahi-ui-gtk3.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs.rshlibs b/srcpkgs/avahi/avahi-ui-libs.rshlibs
index eb4abd2f83..ddc48215fd 100644
--- a/srcpkgs/avahi/avahi-ui-libs.rshlibs
+++ b/srcpkgs/avahi/avahi-ui-libs.rshlibs
@@ -16,7 +16,6 @@ libpango-1.0.so.0
 libfreetype.so.6
 libfontconfig.so.1
 libgobject-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libssp.so.0
 libc.so.6
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index 4a5bd5542a..fd123e6616 100644
--- a/srcpkgs/avahi/avahi-ui-libs.template
+++ b/srcpkgs/avahi/avahi-ui-libs.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the UI shared libraries provided by Avahi."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libavahi-ui.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template
index 27fa92986b..e99718db11 100644
--- a/srcpkgs/avahi/avahi-ui-utils.template
+++ b/srcpkgs/avahi/avahi-ui-utils.template
@@ -1,14 +1,12 @@
 # Template file for 'avahi-ui-utils'.
 #
-depends="desktop-file-utils avahi"
+depends="desktop-file-utils avahi>=$version"
 short_desc="Avahi GTK+ utilities"
 long_desc="${long_desc}
 
  This package contains some small GTK+ utilities to discover services."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/bin/b*" usr/bin
 	vmove "usr/share/man/man1/b*" usr/share/man/man1
 	vmove usr/share/applications usr/share
diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template
index ef21899149..f283a9c00b 100644
--- a/srcpkgs/avahi/avahi-utils.template
+++ b/srcpkgs/avahi/avahi-utils.template
@@ -1,15 +1,12 @@
 # Template file for 'avahi-utils'.
 #
-depends="dbus-libs avahi"
 short_desc="Avahi browsing, publishing and discovery utilities"
 long_desc="${long_desc}
 
  This package contains several utilities that allow you to interact with the
  Avahi daemon, including publish, browsing and discovering services."
 
-
-do_install()
-{
+do_install() {
 	for f in browse publish resolve set-host-name; do
 		vmove "usr/bin/avahi-${f}*" usr/bin
 		vmove "usr/share/man/man1/avahi-${f}*" \
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index da6e3d0fda..c34e295ba3 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=5
+revision=6
 homepage="http://www.avahi.org"
 distfiles="$homepage/download/avahi-$version.tar.gz"
 build_style=gnu-configure
@@ -12,7 +12,9 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
 --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
 --disable-dbm --with-systemdsystemunitdir=/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"
+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"
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"