diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat
index bf34f9275aab..a94bdb5f88b8 100644
--- a/dist/bin/scalac.bat
+++ b/dist/bin/scalac.bat
@@ -39,8 +39,10 @@ if "%_PROG_NAME%"=="%_SCRIPTING_MAIN%" (
 if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS%
 ) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS%
 )
+for %%i in ("%_PROG_HOME%\..") do set "_SCALA_HOME=%%~fi"
+
 call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% %_JVM_CP_ARGS% ^
--Dscala.usejavacp=true ^
+-Dscala.home="%_SCALA_HOME%" -Dscala.usejavacp=true ^
 %_PROG_NAME% %_SCALA_ARGS% %_RESIDUAL_ARGS% %_SCRIPTING_STRING%
 if not %ERRORLEVEL%==0 (
     set _EXITCODE=1
diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat
index c7eb4cb6d472..2a80916c1db7 100644
--- a/dist/bin/scaladoc.bat
+++ b/dist/bin/scaladoc.bat
@@ -149,7 +149,7 @@ goto :eof
 @rem output parameter: _CLASS_PATH
 :updateClasspath
 set "__PATTERN=%~1"
-for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do (
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do (
     set "_CLASS_PATH=!_CLASS_PATH!%_LIB_DIR%\%%f%_PSEP%"
 )
 goto :eof