--- /var/qmail/bin/qmailctl.orig	2006-08-05 09:52:00.000000000 -0300
+++ /var/qmail/bin/qmailctl	2006-08-05 10:05:56.000000000 -0300
@@ -29,6 +29,16 @@
     else
       echo qmail-pop3d supervise not running
     fi
+    if svok /service/spamd ; then
+      svc -u /service/spamd
+    else
+      echo spamd supervise not running
+    fi
+    if svok /service/clamd ; then
+      svc -u /service/clamd
+    else
+      echo clamd supervise not running
+    fi
     ;;
   stop)
     echo "Stopping qmail..."
@@ -41,6 +51,10 @@
     fi
     echo "  qmail-pop3d"
     svc -d /service/qmail-pop3d
+    echo "  spamd"
+    svc -d /service/spamd
+    echo "  clamd"
+    svc -d /service/clamd
     ;;
   stat)
     svstat /service/qmail-send
@@ -49,6 +63,10 @@
     svstat /service/qmail-smtpd/log
     svstat /service/qmail-pop3d
     svstat /service/qmail-pop3d/log
+    svstat /service/spamd
+    svstat /service/spamd/log
+    svstat /service/clamd
+    svstat /service/clamd/log
     qmail-qstat
     ;;
   doqueue|alrm|flush)
@@ -71,6 +89,10 @@
     svc -p /service/qmail-smtpd
     echo "Pausing qmail-pop3d"
     svc -p /service/qmail-pop3d
+    echo "Pausing spamd"
+    svc -p /service/spamd
+    echo "Pausing clamd"
+    svc -p /service/clamd
     ;;
   cont)
     echo "Continuing qmail-send"
@@ -79,6 +101,10 @@
     svc -c /service/qmail-smtpd
     echo "Continuing qmail-pop3d"
     svc -c /service/qmail-pop3d
+    echo "Continuing spamd"
+    svc -c /service/spamd
+    echo "Continuing clamd"
+    svc -c /service/clamd
     ;;
   restart)
     echo "Restarting qmail:"
@@ -90,10 +116,15 @@
     svc -u /service/qmail-smtpd
     echo "* Restarting qmail-pop3d."
     svc -t /service/qmail-pop3d
+    echo "* Restarting spamd."
+    svc -t /service/spamd
+    echo "* Restarting clamd."
+    svc -t /service/clamd
     ;;
   cdb)
     tcprules /var/vpopmail/etc/tcp.smtp.cdb /var/vpopmail/etc/tcp.smtp.tmp < /var/vpopmail/etc/tcp.smtp
     chmod 644 /var/vpopmail/etc/tcp.smtp.cdb
+    chown vpopmail. /var/vpopmail/etc/tcp.smtp.cdb
     echo "Reloaded /var/vpopmail/etc/tcp.smtp."
     ;;
   help)