diff --git a/bootstrap.bat b/bootstrap.bat
index 29cdec754..2f919b39f 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -39,6 +39,7 @@ if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap
 if     "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build
 if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build
 
+SET LOCALCLASSPATH=
 for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i
 if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar
 if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip
@@ -46,7 +47,7 @@ if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\c
 set TOOLS=src\main\org\apache\tools
 set CLASSDIR=build\classes
 
-SET CLASSPATH=%CLASSDIR%;src\main;%CLASSPATH%
+SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
 
 echo JAVA_HOME=%JAVA_HOME%
 echo JAVA=%JAVA%
@@ -132,5 +133,6 @@ set ANT_HOME=%OLDANTHOME%
 set OLDJAVA=
 set OLDJAVAC=
 set BOOTOLDCLASSPATH=
+set LOCALCLASSPATH=
 set OLDANTHOME=
 set TOOLS=