diff --git a/standalone/linux/git-annex b/standalone/linux/git-annex
index cda5b569be..57eb343f95 100755
--- a/standalone/linux/git-annex
+++ b/standalone/linux/git-annex
@@ -1,5 +1,5 @@
 #!/bin/sh
-base="$(dirname $0)"
+base="$(dirname "$0")"
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
 	exit 1
diff --git a/standalone/linux/git-annex-webapp b/standalone/linux/git-annex-webapp
index 61a9bbbebc..40fc6399d1 100755
--- a/standalone/linux/git-annex-webapp
+++ b/standalone/linux/git-annex-webapp
@@ -1,5 +1,5 @@
 #!/bin/sh
-base="$(dirname $0)"
+base="$(dirname "$0")"
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
 	exit 1
diff --git a/standalone/linux/runshell b/standalone/linux/runshell
index a1c93792d2..a36e490839 100755
--- a/standalone/linux/runshell
+++ b/standalone/linux/runshell
@@ -4,7 +4,7 @@
 
 set -e
 
-base="$(dirname $0)"
+base="$(dirname "$0")"
 
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-annex b/standalone/osx/git-annex.app/Contents/MacOS/git-annex
index f6b9d9c789..5c63d15c94 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/git-annex
+++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex
@@ -1,5 +1,5 @@
 #!/bin/sh
-base="$(dirname $0)"
+base="$(dirname "$0")"
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
 	exit 1
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
index b221db32aa..73319d324e 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
+++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
@@ -1,5 +1,5 @@
 #!/bin/sh
-base="$(dirname $0)"
+base="$(dirname "$0")"
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
 	exit 1
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
index 23f9ff253a..9f1457e250 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/runshell
+++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell
@@ -4,7 +4,7 @@
 
 set -e
 
-base="$(dirname $0)"
+base="$(dirname "$0")"
 
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2