diff --git a/munin/trunk/munin-node.init b/munin/trunk/munin-node.init
index 49cc959..51f7223 100755
--- a/munin/trunk/munin-node.init
+++ b/munin/trunk/munin-node.init
@@ -13,6 +13,7 @@ case "$1" in
 	[ -d /var/run/munin ] || mkdir -p /var/run/munin
     /usr/sbin/munin-node >/dev/null
     stat_done
+    add_daemon munin-node
     ;;
   stop)
     stat_busy "Stopping munin-node"
@@ -23,6 +24,7 @@ case "$1" in
         exit 1
       else
         stat_done
+        rm_daemon munin-node
       fi
     else
       stat_fail