diff --git a/install/docker/install-scrypted-docker-compose.sh b/install/docker/install-scrypted-docker-compose.sh
index 69f432229c..4fae3eb64b 100755
--- a/install/docker/install-scrypted-docker-compose.sh
+++ b/install/docker/install-scrypted-docker-compose.sh
@@ -55,6 +55,14 @@ then
     sed -i 's/'#' "\/dev\/dri/"\/dev\/dri/g' $DOCKER_COMPOSE_YML
 fi
 
+readyn "Install avahi-daemon? This is the recommended for reliable HomeKit discovery and pairing."
+if [ "$yn" == "y" ]
+then
+    sudo apt-get -y install avahi-daemon
+    sed -i 's/'#' "\/var\/run\/dbus/"\/var\/run\/dbus/g' $DOCKER_COMPOSE_YML
+    sed -i 's/'#' "\/var\/run\/avahi-daemon/"\/var\/run\/avahi-daemon/g' $DOCKER_COMPOSE_YML
+fi
+
 echo "Setting permissions on $SCRYPTED_HOME"
 chown -R $SERVICE_USER $SCRYPTED_HOME