diff --git a/jpos/src/dist/bin/start b/jpos/src/dist/bin/start
index 177082ce7d..d8b8d6b9a3 100755
--- a/jpos/src/dist/bin/start
+++ b/jpos/src/dist/bin/start
@@ -1,5 +1,8 @@
 #!/bin/sh
 
-cd `dirname $0`
-echo Starting Q2
+dir_path=$(dirname "$0")
+cd "$dir_path/.." || exit 1
+echo "Starting Q2 $(basename "$PWD")"
+cd "$dir_path" || exit 1
+
 nohup ./q2 "$@" > /dev/null 2>&1 &
diff --git a/jpos/src/dist/bin/stop b/jpos/src/dist/bin/stop
index 355684fc2f..224d08cad5 100755
--- a/jpos/src/dist/bin/stop
+++ b/jpos/src/dist/bin/stop
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-echo Stopping Q2
+
 cd $(dirname $0)/.. || exit 1
+echo "Stopping Q2 $(basename "$PWD")"
 if [ -f jpos.pid ] && ps -p $(cat jpos.pid) > /dev/null 2>&1; then
     kill $(cat jpos.pid)
 else