diff --git a/build.bat b/build.bat
index a091c1f1c..965b3c768 100755
--- a/build.bat
+++ b/build.bat
@@ -1,4 +1,5 @@
 @echo off
 REM convience bat file to build with
-if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
-java -classpath "%CLASSPATH%;lib\ant.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+set TOOLSJAR=
+if exist %JAVA_HOME%\lib\tools.jar set TOOLSJAR=%JAVA_HOME%\lib\tools.jar
+java -classpath "%CLASSPATH%;%TOOLSJAR%;lib\ant.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5