diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run
index b6b278eba5c..1710a13cea1 100755
--- a/srcpkgs/avahi/files/avahi-daemon/run
+++ b/srcpkgs/avahi/files/avahi-daemon/run
@@ -1,2 +1,6 @@
 #!/bin/sh
+# if dbus is enabled wait for it.
+if [ -L /var/service/dbus ]; then
+	sv check dbus > /dev/null || exit 1
+fi
 exec avahi-daemon -s
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index ba9ba03004e..dd49736b8f3 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl