diff --git a/env.sh b/env.sh
index ce50ff7c863f5..078bebbd990f6 100755
--- a/env.sh
+++ b/env.sh
@@ -54,9 +54,9 @@ else
 			p=$(($p+1))
 			[ $p -gt $# ] && break
 			a=`eval echo "\$\{$p\}"`
-			par="$par$a "
+			par="$par\"$a\" "
 		done
-		eval $new_env $par "\"\${$#}\""
+		eval $new_env $par
 	else
 		eval $new_env $*
 	fi