diff --git a/master/contrib/init-scripts/buildmaster.init.sh b/master/contrib/init-scripts/buildmaster.init.sh
index f1e3104b1f0..fb23f7b197f 100755
--- a/master/contrib/init-scripts/buildmaster.init.sh
+++ b/master/contrib/init-scripts/buildmaster.init.sh
@@ -125,7 +125,9 @@ function master_op () {
 function do_op () {
     errors=0
     for i in $( seq ${#MASTER_ENABLED[@]} ); do
-        if is_disabled "${MASTER_ENABLED[$i]}" ; then
+        if [ -n "$4" ] && [ "$4" != "${MASTER_NAME[$i]}" ] ; then
+            continue
+        elif is_disabled "${MASTER_ENABLED[$i]}" && [ -z "$4" ] ; then
             continue
         fi
 
@@ -152,19 +154,19 @@ function do_op () {
 
 case "$1" in
     start)
-        do_op "master_op" "start" "Starting buildmaster"
+        do_op "master_op" "start" "Starting buildmaster" "$2"
         exit $?
         ;;
     stop)
-        do_op "master_op" "stop" "Stopping buildmaster"
+        do_op "master_op" "stop" "Stopping buildmaster" "$2"
         exit $?
         ;;
     reload)
-        do_op "master_op" "reconfig" "Reloading buildmaster"
+        do_op "master_op" "reconfig" "Reloading buildmaster" "$2"
         exit $?
         ;;
     restart|force-reload)
-        do_op "master_op" "restart" "Restarting buildmaster"
+        do_op "master_op" "restart" "Restarting buildmaster" "$2"
         exit $?
         ;;
     *)
diff --git a/slave/contrib/init-scripts/buildslave.init.sh b/slave/contrib/init-scripts/buildslave.init.sh
index ea305700568..b838877d1d7 100755
--- a/slave/contrib/init-scripts/buildslave.init.sh
+++ b/slave/contrib/init-scripts/buildslave.init.sh
@@ -157,7 +157,9 @@ function slave_op () {
 function do_op () {
     errors=0
     for i in $( seq ${#SLAVE_ENABLED[@]} ); do
-        if is_disabled "${SLAVE_ENABLED[$i]}" ; then
+        if [ -n "$4" ] && [ "$4" != "${SLAVE_NAME[$i]}" ] ; then
+            continue
+        elif is_disabled "${SLAVE_ENABLED[$i]}" && [ -z "$4" ] ; then
             continue
         fi
 
@@ -184,19 +186,19 @@ function do_op () {
 
 case "$1" in
     start)
-        do_op "slave_op" "start" "Starting buildslave"
+        do_op "slave_op" "start" "Starting buildslave" "$2"
         exit $?
         ;;
     stop)
-        do_op "slave_op" "stop" "Stopping buildslave"
+        do_op "slave_op" "stop" "Stopping buildslave" "$2"
         exit $?
         ;;
     reload)
-        do_op "slave_op" "reload" "Reloading buildslave"
+        do_op "slave_op" "reload" "Reloading buildslave" "$2"
         exit $?
         ;;
     restart|force-reload)
-        do_op "slave_op" "restart" "Restarting buildslave"
+        do_op "slave_op" "restart" "Restarting buildslave" "$2"
         exit $?
         ;;
     *)