diff --git a/configure b/configure
index f0a3044a..e0fe6efb 100755
--- a/configure
+++ b/configure
@@ -438,7 +438,7 @@ fi
 
 if test -z "$build_cross"; then
   CONFTEST=./conftest$EXESUF
-  if ! $cc -o $CONFTEST $source_path/conftest.c ; then
+  if ! $cc -o $CONFTEST "$source_path/conftest.c" ; then
     echo "configure: error: '$cc' failed to compile conftest.c."
   else
     cc_name="$($CONFTEST compiler)"
@@ -553,7 +553,7 @@ fcho "Switches            " "$tcc_switches"
 fcho "Config              " "${confvars# }"
 echo "Creating config.mak and config.h"
 
-version=`head $source_path/VERSION`
+version=$(head "$source_path/VERSION")
 
 cat >config.mak <<EOF
 # Automatically generated by configure - do not modify
@@ -726,13 +726,13 @@ fn_makelink()
 	 ;;
     esac
 
-    ln -sfn $tgt $2 || ( echo "ln failed. Using cp instead."; cp -f $1/$2 $2 )
+    ln -sfn "$tgt" $2 || ( echo "ln failed. Using cp instead."; cp -f "$1/$2" $2 )
 }
 
 if test "$source_path_used" = "yes" ; then
   FILES="Makefile lib/Makefile tests/Makefile tests/tests2/Makefile tests/pp/Makefile"
   for f in $FILES ; do
-    fn_makelink $source_path $f
+    fn_makelink "$source_path" $f
   done
 fi