diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
index ef12e72fa0..675e56babb 100644
--- a/packages/network/avahi/init.d/53_avahi
+++ b/packages/network/avahi/init.d/53_avahi
@@ -23,11 +23,12 @@
 # runlevels: openelec, textmode
 
 (
-  # sleep 10 sec to be ensure network is started
-    usleep 10000000
-
+  wait_for_inet_addr
   progress "Starting Avahi Daemon"
 
     mkdir -p /var/run/avahi-daemon
-    avahi-daemon -D
+    while true; do
+      sleep 2
+      avahi-daemon
+    done
 )&