diff --git a/scripts/wait_for_service b/scripts/wait_for_service
index 5c9dbf1..1ee8a77 100755
--- a/scripts/wait_for_service
+++ b/scripts/wait_for_service
@@ -1,7 +1,12 @@
-if [ $# -ne 2 ]
-  then
-    echo "Hostname and port of the service was not specified"
-    exit 1
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+	echo "Usage: $0 <hostname> <port>" >&2
+	exit 1
 fi
 
-while ! nc -z $1 $2; do echo "$1:$2 not yet available, waiting" && sleep 1; done; echo "Done"
+while ! nc -z "$1" "$2"; do
+	echo "$1:$2 not yet available, waiting"
+	sleep 1
+done
+echo "Done"