diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template
index ff35fcea24a..24712b85d6a 100644
--- a/srcpkgs/avahi/avahi-autoipd.template
+++ b/srcpkgs/avahi/avahi-autoipd.template
@@ -1,6 +1,5 @@
 # Template file for 'avahi-autoipd'.
 #
-revision=1
 short_desc="Avahi IPv4LL network address configuration daemon"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index da062d63e0a..ab66390c4eb 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
-revision=2
 
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-compat-libs
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index a5b605b6b5b..8fddf159689 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
-revision=3
 
 
 do_install()
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index a795d0c7dae..ea62bb356ab 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/srcpkgs/avahi/avahi-discover.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains a user interface for discovering services."
 
-revision=1
 noarch=yes
 pycompile_module="avahi_discover"
 
@@ -17,12 +16,13 @@ Add_dependency run pygtk
 Add_dependency run desktop-file-utils
 
 
-do_install()
-{
+do_install() {
 	vmove usr/bin/avahi-discover usr/bin
 	vmove "usr/share/man/man1/avahi-discover*" usr/share/man/man1
 	vmove usr/share/applications/avahi-discover.desktop \
 		usr/share/applications
 	vmove usr/lib/python2.7/site-packages/avahi_discover \
 		usr/lib/python2.7/site-packages
+	vmove usr/share/avahi/interfaces/avahi-discover.ui \
+		usr/share/avahi/interfaces
 }
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 4665e7533da..72211d518a8 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains development files for the glib libraries
  provided by Avahi."
 
-revision=3
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-glib-libs
 
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index 053640799c4..1083d17a701 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
-revision=3
 
 
 do_install()
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index 30ec300ce24..c1729e06a79 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains development files for the core libraries
  provided by Avahi."
 
-revision=2
 
 Add_dependency run glibc-devel
 Add_dependency run libssp-devel
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 2f2d58a9718..39ded5f6f38 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
-revision=3
 
 Add_dependency run gdbm
 
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index 4e8b7f6f7d0..41a7cb9c8f5 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/srcpkgs/avahi/avahi-python.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains utility modules to talk to Avahi with Python easier."
 
-revision=1
 noarch=yes
 pycompile_module="avahi"
 
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index a5d74f37d8e..ec4f8ff234d 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains development files for the UI libraries
  provided by Avahi."
 
-revision=2
 
 Add_dependency run glibc-devel
 Add_dependency run gtk+-devel
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
index 5018d2a8987..8547151252c 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the GTK+3 UI shared libraries provided by Avahi."
 
-revision=5
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index 1b54f8ca45a..4a5bd5542a3 100644
--- a/srcpkgs/avahi/avahi-ui-libs.template
+++ b/srcpkgs/avahi/avahi-ui-libs.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the UI shared libraries provided by Avahi."
 
-revision=5
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template
index 0a2c0be8e3d..c0808772119 100644
--- a/srcpkgs/avahi/avahi-ui-utils.template
+++ b/srcpkgs/avahi/avahi-ui-utils.template
@@ -1,6 +1,5 @@
 # Template file for 'avahi-ui-utils'.
 #
-revision=2
 short_desc="Avahi GTK+ utilities"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template
index 12cfe2fec6b..ae633a4688e 100644
--- a/srcpkgs/avahi/avahi-utils.template
+++ b/srcpkgs/avahi/avahi-utils.template
@@ -1,6 +1,5 @@
 # Template file for 'avahi-utils'.
 #
-revision=2
 short_desc="Avahi browsing, publishing and discovery utilities"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 1fe8af06da5..950cd48cfbd 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,6 @@
 # Template file for 'avahi'
 pkgname=avahi
-version=0.6.30
-revision=5
+version=0.6.31
 homepage="http://www.avahi.org"
 distfiles="$homepage/download/avahi-$version.tar.gz"
 build_style=gnu-configure
@@ -9,13 +8,12 @@ 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=gentoo --disable-xmltoman
---disable-dbm
---with-systemdsystemunitdir=/lib/systemd/system"
+--with-autoipd-group=avahi --with-distro=none --disable-xmltoman
+--disable-dbm --with-systemdsystemunitdir=/lib/systemd/system"
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
+checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 long_desc="
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts running on a
@@ -26,7 +24,12 @@ long_desc="
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
 systemd_services="avahi-daemon.service on avahi-dnsconfd.service on"
-conf_files="/etc/avahi/avahi-daemon.conf /etc/avahi/hosts.conf"
+conf_files="
+/etc/avahi/services/ssh.service
+/etc/avahi/services/sftp-ssh.service
+/etc/avahi/avahi-daemon.conf
+/etc/avahi/hosts
+/etc/avahi/avahi-dnsconfd.action"
 
 subpackages="$pkgname-autoipd $pkgname-discover $pkgname-compat-libs"
 subpackages="$subpackages $pkgname-compat-libs-devel $pkgname-libs"
@@ -51,8 +54,3 @@ 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
-}