diff --git a/etc/rc.d/rc.samba b/etc/rc.d/rc.samba
index 69572974e..089c4cda1 100755
--- a/etc/rc.d/rc.samba
+++ b/etc/rc.d/rc.samba
@@ -155,12 +155,12 @@ samba_stop(){
   else
     REPLY="Stopped"
     # stop gracefully with SIGTERM
-    run killall smbd nmbd wsdd2 winbindd
+    run killall --ns $$ smbd nmbd wsdd2 winbindd
     samba_waitfor_shutdown
     if samba_running; then
       REPLY="Killed"
       # stop forcibly with SIGKILL
-      run killall -SIGKILL smbd nmbd wsdd2 winbindd
+      run killall --ns $$ -SIGKILL smbd nmbd wsdd2 winbindd
       samba_waitfor_shutdown
     fi
     if ! samba_running; then
@@ -186,14 +186,12 @@ samba_restart(){
 }
 
 samba_reload(){
-  killall smbd nmbd wsdd2 winbindd 2>/dev/null
+  killall --ns $$ wsdd2 2>/dev/null
   # update settings
   samba_settings
-  # restart services
-  $SMBD -D 2>/dev/null
-  [[ $USE_NETBIOS == yes ]] && $NMBD -D 2>/dev/null
+  # reload services with smbcontrol
+  smbcontrol all reload-config 2>/dev/null
   [[ $USE_WSD == yes ]] && $WSDD2 -d ${WSD2_OPT## } 2>/dev/null
-  $WINBINDD -D 2>/dev/null
 }
 
 samba_update(){