diff --git a/song-client/src/main/bin/sing b/song-client/src/main/bin/sing
index aa8256d29..968926fc6 100755
--- a/song-client/src/main/bin/sing
+++ b/song-client/src/main/bin/sing
@@ -43,8 +43,12 @@ if [[ "$_java" ]]; then
 fi
 
 here=$(dirname $0)
-sing_home=${here%/bin}
-#         -Dspring.config.location="$sing_home/conf/" \
+if [ "$here" == "." ]; then
+	# This is the case, when the user runs this script from the ./bin directory
+	sing_home=../
+else
+	sing_home=${here%/bin}
+fi
 
 java --illegal-access=deny \
 		 -Dlog.name=song \