diff --git a/scripts/savecore b/scripts/savecore
index becd752c..6594d908 100755
--- a/scripts/savecore
+++ b/scripts/savecore
@@ -65,8 +65,8 @@ saved_core=$core_dir/core-$tstamp
 
 mkdir -p $core_dir
 if [ `df -kP $core_dir | awk 'NR!=1 { print $4 }'` -lt "$space_low" ]
-then rm -f $core_name; exit
+then rm -f "$core_name"; exit
 fi
 
-mv -f $core_name $saved_core
+mv -f "$core_name" $saved_core
 saved=y
diff --git a/src/scripts/gen-client-configure b/src/scripts/gen-client-configure
index 952b7a0d..eb6bba5e 100755
--- a/src/scripts/gen-client-configure
+++ b/src/scripts/gen-client-configure
@@ -5,8 +5,8 @@ if [ $# = 0 ]; then
     exit 1
 fi
 
-cd $1-$2
-printf "%s" $2 >.tarball-version
+cd "$1-$2"
+printf "%s" "$2" >.tarball-version
 cat m4/*.m4 >aclocal.m4
 autoconf
 autoheader
diff --git a/src/scripts/tarball b/src/scripts/tarball
index 64a13ef4..b356975f 100755
--- a/src/scripts/tarball
+++ b/src/scripts/tarball
@@ -27,7 +27,7 @@ else usage; exit 1
 fi
 
 nv=$name-$version
-mkdir $nv
+mkdir "$nv"
 
 # arrange cleanup
 trap 'rm -rf "$nv"' 0
@@ -47,4 +47,4 @@ done
 
 $script $name $version
 
-tar -czf $nv.tar.gz --owner=0 --group=0 --mode=ug+w,a+rX $nv
+tar -czf "$nv".tar.gz --owner=0 --group=0 --mode=ug+w,a+rX "$nv"