diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 618852c3847ea..e0f036e4d6029 100644
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.9_rc4
+PKG_VERSION:=0.9_rc5
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-0.9-rc4.tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/avahi/avahi/tar.gz/v0.9-rc4?
-PKG_HASH:=08fcc57377ed05416ec4b3d8a179da716a7a9376821551a5ae16f8276a1ef0b5
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-0.9-rc4
+PKG_SOURCE:=$(PKG_NAME)-0.9-rc5.tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/avahi/avahi/tar.gz/v0.9-rc5?
+PKG_HASH:=5b0a9d88110b0fc8aaafc5cc0a26e83e7d2a4aca3a36bc27c9b626db7ead27b0
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-0.9-rc5
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -82,10 +82,12 @@ define Package/avahi-dbus-daemon
   $(call Package/avahi/Default)
   PROVIDES:=avahi-daemon
   VARIANT:=dbus
+  DEFAULT_VARIANT:=1
   SUBMENU:=IP Addresses and Names
   DEPENDS:=+libavahi-dbus-support +libexpat +librt +libdaemon
   TITLE+= (daemon)
   USERID:=avahi=105:avahi=105
+  CONFLICTS:=libavahi-nodbus-support
 endef
 
 define Package/avahi-nodbus-daemon
@@ -167,8 +169,10 @@ endef
 define Package/libavahi-dbus-support
   $(call Package/libavahi/Default)
   VARIANT:=dbus
-  DEPENDS:=+dbus
+  DEFAULT_VARIANT:=1
+  DEPENDS:=+PACKAGE_libavahi-dbus-support:dbus
   TITLE+= (D-Bus support)
+  CONFLICTS:=libavahi-nodbus-support
 endef
 
 define Package/libavahi-nodbus-support
@@ -207,6 +211,7 @@ define Package/libavahi-client
   VARIANT:=dbus
   DEPENDS:=+avahi-dbus-daemon
   TITLE+= (libavahi-client library)
+  CONFLICTS:=libavahi-nodbus-support
 endef
 
 define Package/libavahi-client/description
@@ -224,6 +229,7 @@ define Package/avahi-utils
   VARIANT:=dbus
   DEPENDS:=+libavahi-client +libgdbm
   TITLE+= (utilities)
+  CONFLICTS:=libavahi-nodbus-support
 endef
 
 define Package/avahi-utils/description
diff --git a/libs/avahi/test-version.sh b/libs/avahi/test-version.sh
new file mode 100755
index 0000000000000..2d3601aa3b9c1
--- /dev/null
+++ b/libs/avahi/test-version.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# shellcheck shell=busybox
+
+_version_check() {
+	local bin="$1" pkg="$2" ver="$3"
+	# apk versions use _ where upstream uses - (e.g. 0.9_rc4 vs 0.9-rc4)
+	local upstream_ver
+	upstream_ver=$(echo "$ver" | tr '_' '-')
+	"$bin" -V 2>&1 | grep -F "$upstream_ver" || {
+		echo "FAIL: $bin -V did not print expected version '$upstream_ver'"
+		exit 1
+	}
+}
+
+case "$PKG_NAME" in
+avahi-autoipd)
+	_version_check avahi-autoipd avahi-autoipd "$PKG_VERSION"
+	;;
+
+avahi-dbus-daemon|\
+avahi-nodbus-daemon)
+	_version_check avahi-daemon avahi-daemon "$PKG_VERSION"
+	;;
+
+avahi-dnsconfd)
+	_version_check avahi-dnsconfd avahi-dnsconfd "$PKG_VERSION"
+	;;
+
+avahi-daemon-service-http|\
+avahi-daemon-service-ssh|\
+avahi-utils|\
+libavahi-client|\
+libavahi-dbus-support|\
+libavahi-nodbus-support)
+	exit 0
+	;;
+
+*)
+	echo "Untested package: $PKG_NAME" >&2
+	exit 1
+	;;
+esac
diff --git a/libs/avahi/test.sh b/libs/avahi/test.sh
index 4175934ace611..a57c0f87e22ef 100644
--- a/libs/avahi/test.sh
+++ b/libs/avahi/test.sh
@@ -1,16 +1,5 @@
 #!/bin/sh
 
-_version_check() {
-	local bin="$1" pkg="$2" ver="$3"
-	# apk versions use _ where upstream uses - (e.g. 0.9_rc4 vs 0.9-rc4)
-	local upstream_ver
-	upstream_ver=$(echo "$ver" | tr '_' '-')
-	"$bin" -V 2>&1 | grep -F "$upstream_ver" || {
-		echo "FAIL: $bin -V did not print expected version '$upstream_ver'"
-		exit 1
-	}
-}
-
 _lib_check() {
 	local f="$1"
 	[ -e "$f" ] || { echo "FAIL: $f not found"; exit 1; }
@@ -20,10 +9,6 @@ _lib_check() {
 # Works for both dbus and nodbus variants; dbus variant skips the start
 # test when avahi-utils (which needs dbus) is not installed.
 _daemon_start_test() {
-	local ver="$1"
-
-	_version_check avahi-daemon avahi-daemon "$ver"
-
 	# Config file from package
 	[ -f /etc/avahi/avahi-daemon.conf ] || {
 		echo "FAIL: /etc/avahi/avahi-daemon.conf not installed"
@@ -41,36 +26,36 @@ _daemon_start_test() {
 	# Try to start avahi-daemon with a minimal config and no privilege drop
 	mkdir -p /var/run/avahi-daemon /tmp/avahi-test
 
-	cat > /tmp/avahi-test/avahi-daemon.conf << 'EOF'
-[server]
-host-name=avahi-test
-use-ipv4=yes
-use-ipv6=no
-check-response-ttl=no
-use-iff-running=no
-enable-dbus=no
-
-[wide-area]
-enable-wide-area=no
-
-[publish]
-publish-addresses=yes
-publish-hinfo=no
-publish-workstation=no
-publish-domain=yes
-disable-publishing=no
-
-[reflector]
-enable-reflector=no
-
-[rlimits]
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=30
-rlimit-stack=4194304
-rlimit-nproc=3
-EOF
+	cat > /tmp/avahi-test/avahi-daemon.conf <<-'EOF'
+	[server]
+	host-name=avahi-test
+	use-ipv4=yes
+	use-ipv6=no
+	check-response-ttl=no
+	use-iff-running=no
+	enable-dbus=no
+
+	[wide-area]
+	enable-wide-area=no
+
+	[publish]
+	publish-addresses=yes
+	publish-hinfo=no
+	publish-workstation=no
+	publish-domain=yes
+	disable-publishing=no
+
+	[reflector]
+	enable-reflector=no
+
+	[rlimits]
+	rlimit-core=0
+	rlimit-data=4194304
+	rlimit-fsize=0
+	rlimit-nofile=30
+	rlimit-stack=4194304
+	rlimit-nproc=3
+	EOF
 
 	avahi-daemon --no-drop-root --no-chroot \
 		--file=/tmp/avahi-test/avahi-daemon.conf \
@@ -150,11 +135,10 @@ libavahi-client)
 	;;
 
 avahi-dbus-daemon|avahi-nodbus-daemon)
-	_daemon_start_test "$2"
+	_daemon_start_test
 	;;
 
 avahi-autoipd)
-	_version_check avahi-autoipd avahi-autoipd "$2"
 	[ -x /usr/sbin/avahi-autoipd ] || { echo "FAIL: avahi-autoipd not executable"; exit 1; }
 	[ -x /etc/avahi/avahi-autoipd.action ] || {
 		echo "FAIL: avahi-autoipd.action script not installed"
@@ -175,7 +159,6 @@ avahi-daemon-service-ssh)
 	;;
 
 avahi-dnsconfd)
-	_version_check avahi-dnsconfd avahi-dnsconfd "$2"
 	[ -x /usr/sbin/avahi-dnsconfd ] || { echo "FAIL: avahi-dnsconfd not executable"; exit 1; }
 	[ -x /etc/avahi/avahi-dnsconfd.action ] || {
 		echo "FAIL: avahi-dnsconfd.action not installed"