diff --git a/config-distros.sh b/config-distros.sh
index fd3a732..d17a9c2 100755
--- a/config-distros.sh
+++ b/config-distros.sh
@@ -5,7 +5,7 @@ case "$installdir" in
 "")	custominst=false;;
 esac
 
-INSTDIR=${installdir:-$LOCALAPPDATA/wsltty}
+INSTDIR="${installdir:-$LOCALAPPDATA/wsltty}"
 INSTDIR=`cd "$INSTDIR"; pwd`
 installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
 
@@ -15,7 +15,7 @@ case "$INSTDIR" in
 *)	TARGETPATH="$INSTDIR"/bin/mintty.exe;;
 esac
 
-CONFDIR=${configdir:-$APPDATA/wsltty}
+CONFDIR="${configdir:-$APPDATA/wsltty}"
 configdir=${configdir:-'%APPDATA%\wsltty'}
 
 PATH=/bin:"$PATH":$SYSTEMROOT/System32
diff --git a/install.bat b/install.bat
index d0c9a91..e9aa018 100755
--- a/install.bat
+++ b/install.bat
@@ -1,12 +1,12 @@
 @echo off
 
 set refinstalldir=%%LOCALAPPDATA%%\wsltty
-set installdir=%LOCALAPPDATA%\wsltty
+set installdir="%LOCALAPPDATA%\wsltty"
 set refconfigdir=%%APPDATA%%\wsltty
-set configdir=%APPDATA%\wsltty
-set oldroot=%installdir%
-set oldhomedir=%installdir%\home\%USERNAME%
-set oldconfigdir=%oldhomedir%\.config\mintty
+set configdir="%APPDATA%\wsltty"
+set oldroot="%installdir%"
+set oldhomedir="%installdir%\home\%USERNAME%"
+set oldconfigdir="%oldhomedir%\.config\mintty"
 if not "%1" == "" set refinstalldir=%1 && set installdir=%1
 if not "%2" == "" set refconfigdir=%2 && set configdir=%2
 
@@ -79,7 +79,7 @@ copy mintty.ico "%installdir%\usr\share\mintty\icon"
 
 
 rem create Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
 mkdir "%smf%"
 
 rem clean up previous installation
diff --git a/uninstall.bat b/uninstall.bat
index 1460cd1..c40d671 100755
--- a/uninstall.bat
+++ b/uninstall.bat
@@ -1,12 +1,12 @@
 @echo off
 
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
+if "%installdir%" == "" set installdir="%LOCALAPPDATA%\wsltty"
 
 
 :shortcuts
 
 rem delete Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
 rmdir /S /Q "%smf%"