diff --git a/set_version b/set_version
index 81e05af491..675d612e5f 100755
--- a/set_version
+++ b/set_version
@@ -49,7 +49,7 @@ fi
 
 # --binhost needs to be evaluated first since it impacts other variables set below
 custom_binhost="false"
-for arg in ${@} ; do
+for arg in "${@}" ; do
     if $custom_binhost; then
         echo "Using custom binhost '${arg}'"
         DEFAULT_BASE_URL="${arg}"