diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run
index 6b78be21887..b6b278eba5c 100755
--- a/srcpkgs/avahi/files/avahi-daemon/run
+++ b/srcpkgs/avahi/files/avahi-daemon/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-sv check dbus >/dev/null || exit 1
 exec avahi-daemon -s
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 4fe20800a0b..8101aa7ed8e 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=25
+revision=26
 build_pie=yes
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -22,7 +22,6 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 
 hostmakedepends="pkg-config intltool python"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
-depends="dbus"
 conf_files="
 	/etc/avahi/services/ssh.service
 	/etc/avahi/services/sftp-ssh.service
@@ -46,6 +45,8 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/lib/python*
 	# Enable 'disallow_other_stacks' option by default.
 	sed -e 's,\#\(disallow-other-stacks\).*,\1=yes,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
+	# Set 'enable-dbus=warn' option by default to not require dbus.
+	sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
 	vsv avahi-daemon
 }