diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat
index d8fbf9abae0a..eb5d814d514d 100644
--- a/dist/bin/scaladoc.bat
+++ b/dist/bin/scaladoc.bat
@@ -107,17 +107,17 @@ goto :eof
 @rem It contains the path th the absolute classpaths
 :classpathArgs
 
-set _ETC_DIR="%_PROG_HOME%\etc"
-set _TMP_DIR="%_PROG_HOME%\tmp"
-set _INPUT_CLASSPATH_FILE="%_ETC_DIR%\scaladoc.classpath"
-set _OUTPUT_CLASSPATH_FILE="%_TMP_DIR%\scaladoc.classpath"
+set "_ETC_DIR=%_PROG_HOME%\etc"
+set "_TMP_DIR=%_PROG_HOME%\tmp"
+set "_INPUT_CLASSPATH_FILE=%_ETC_DIR%\scaladoc.classpath"
+set "_OUTPUT_CLASSPATH_FILE=%_TMP_DIR%\scaladoc.classpath"
 
 @rem Check if the _TMP_DIR exists. If not, create it (first time we run the command)
 if not exist "%TMP_DIR%" ( mkdir "%TMP_DIR%" )
 
 @rem If the file doesn't exist, create it (first time we run the command)
 if not exist "%_OUTPUT_CLASSPATH_FILE%" ( call :loadClasspathFromFile )
-set _CLASS_PATH_FILE="%_OUTPUT_CLASSPATH_FILE%"
+set "_CLASS_PATH_FILE=%_OUTPUT_CLASSPATH_FILE%"
 goto :eof
 
 @REM concatentate every line in _INPUT_CLASSPATH_FILE and dump it in the with _PSEP
@@ -125,7 +125,7 @@ goto :eof
 set _CLASS_PATH=
 if exist "%_INPUT_CLASSPATH_FILE%" (
     for /f "usebackq delims=" %%i in "%_INPUT_CLASSPATH_FILE%" do (
-        set _LIB="%_PROG_HOME%\maven2\%%i"
+        set "_LIB=%_PROG_HOME%\maven2\%%i"
         @rem Adapt the paths from Unix style to MS-DOS style
         set "_LIB=!_LIB:/=\!"
         @rem Append the processed line to the output file, ensuring a new line