diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk
index b52060f7f2..c7d659f471 100644
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -115,5 +115,5 @@ post_install() {
   add_group avahiautoipd 496
 
   enable_service avahi-daemon.service
-  enable_service avahi-daemon.socket
+  enable_service avahi-monitor.path
 }
diff --git a/packages/network/avahi/system.d/avahi-daemon.service b/packages/network/avahi/system.d/avahi-daemon.service
new file mode 100644
index 0000000000..b266b88734
--- /dev/null
+++ b/packages/network/avahi/system.d/avahi-daemon.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Avahi Daemon
+After=syslog.target debug.service network.target
+
+ConditionPathExists=/storage/.cache/services/avahi.conf
+
+[Service]
+# EnvironmentFile=/storage/.cache/services/avahi.conf
+EnvironmentFile=-/run/openelec/debug.conf
+ExecStart=/usr/sbin/avahi-daemon -s $AVAHI_DEBUG
+ExecReload=/usr/sbin/avahi-daemon -r
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packages/network/avahi/system.d/avahi-monitor.path b/packages/network/avahi/system.d/avahi-monitor.path
new file mode 100644
index 0000000000..f463a31bff
--- /dev/null
+++ b/packages/network/avahi/system.d/avahi-monitor.path
@@ -0,0 +1,9 @@
+[Unit]
+Description=Avahi configfile monitor
+
+[Path]
+PathModified=/storage/.cache/services/avahi.conf
+PathModified=/run/openelec/debug.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packages/network/avahi/system.d/avahi-monitor.service b/packages/network/avahi/system.d/avahi-monitor.service
new file mode 100644
index 0000000000..039448ee70
--- /dev/null
+++ b/packages/network/avahi/system.d/avahi-monitor.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Avahi configfile monitor
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/systemctl restart avahi-daemon.service
+
+[Install]
+WantedBy=multi-user.target