diff --git a/tools/build-all.sh b/tools/build-all.sh
index 3b69e1c00ed4815b16e29926329b878e21faba77..e9d137fa8c86f97ca183beacc51f89fd5f06ee65 100755
--- a/tools/build-all.sh
+++ b/tools/build-all.sh
@@ -46,7 +46,7 @@ do
       C) CREATE_OPT="$OPTARG" ;;
       o) OLDLISP="$OPTARG" ;;
       8) OLD8="$OPTARG" ;;
-      v) VERSION="$OPTARG" ;;
+      v) VERSION="$OPTARG"; VERSION_SET=true ;;
       U) UPDATE_TRANS="-U" ;;
       P) UPDATE_POT="" ;;
       \?) usage ;;
@@ -83,16 +83,19 @@ buildx86 ()
 
 buildsun4 ()
 {
+    if [ "$VERSION_SET" = true ]; then
+      VERS="-v '"$VERSION"'"
+    fi
     # Build non-unicode versions
     if [ -n "$OLD8" ]; then
 	set -x
-	src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8"
+	src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8"
 	set +x
     fi
     # Build the unicode version.
     if [ -n "$OLDLISP" ]; then
 	set -x
-	src/tools/build.sh -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
+	src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
 	set +x
     fi
 }