diff --git a/src/bin/ant b/src/bin/ant
index bfe80973f..dff60bee2 100644
--- a/src/bin/ant
+++ b/src/bin/ant
@@ -52,7 +52,7 @@ if [ "$JAVA_HOME" != "" ] ; then
     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
   fi
 else
-  echo "Warning: JAVA_HOME environment variable not set."
+  echo "Warning: JAVA_HOME environment variable is not set."
   echo "  If build fails because sun.* classes could not be found"
   echo "  you will need to set the JAVA_HOME environment variable"
   echo "  to the installation directory of java."
diff --git a/src/bin/ant.bat b/src/bin/ant.bat
index 16805d2c8..6544b0243 100755
--- a/src/bin/ant.bat
+++ b/src/bin/ant.bat
@@ -23,9 +23,21 @@ if "%JAVACMD%" == "" set JAVACMD=java
 set LOCALCLASSPATH=%CLASSPATH%
 for %%i in (%ANT_HOME%\lib\*.jar) do call %ANT_HOME%\bin\lcp.bat %%i
 
-if "%JAVA_HOME%" == "" goto runAnt
+if "%JAVA_HOME%" == "" goto noJavaHome
 if exist %JAVA_HOME%\lib\tools.jar call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\tools.jar
 if exist %JAVA_HOME%\lib\classes.zip call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\classes.zip
+goto checkJikes
+
+:noJavaHome
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo   If build fails because sun.* classes could not be found
+echo   you will need to set the JAVA_HOME environment variable
+echo   to the installation directory of java.
+echo.
+
+:checkJikes
+if not "%JIKESPATH%" == "" set ANT_OPTS=%ANT_OPTS% -Djikes.class.path=%JIKESPATH%
 
 :runAnt
 %JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9