diff --git a/tools/server-setup.sh b/tools/server-setup.sh
index 9a32fe5..0724c87 100755
--- a/tools/server-setup.sh
+++ b/tools/server-setup.sh
@@ -28,12 +28,16 @@ if [ -d "servers/$HOSTNAME/setup.d" ]; then
     cd servers/$HOSTNAME
     for s in setup.d/*; do
         echo "running (servers/$HOSTNAME/)$s..."
-        sh $s
+        $s | while read line; do
+            echo "$s: $line"
+        done
     done
     cd -
 fi
 
 for s in tools/server-setup.d/*; do
     echo "running $s..."
-    sh $s
+    $s | while read line; do
+    echo "$s: $line"
+    done
 done