diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
index c23073a39c..60e84a9a07 100644
--- a/packages/network/avahi/init.d/53_avahi
+++ b/packages/network/avahi/init.d/53_avahi
@@ -22,11 +22,17 @@
 #
 # runlevels: openelec, textmode
 
-(
-  wait_for_network
+case $RUNLEVEL in
+  boot)
+    (
+      wait_for_network
 
-  progress "Starting Avahi Daemon"
+      progress "Starting Avahi Daemon"
+        mkdir -p /var/run/avahi-daemon
+        avahi-daemon -D
+    )&
+    ;;
 
-    mkdir -p /var/run/avahi-daemon
-    avahi-daemon -D
-)&
+  poweroff|reboot)
+    ;;
+esac