diff --git a/bootstrap.sh b/bootstrap.sh
index 3ae87a84f..db013da12 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,7 +32,7 @@ ANT_HOME=.
 export ANT_HOME
 
 if [ -z "$JAVAC" ] ; then
-  JAVAC=javac;
+  JAVAC=${JAVA_HOME}/bin/javac;
 fi
 
 echo ... Bootstrapping Ant Distribution
@@ -40,6 +40,9 @@ echo ... Bootstrapping Ant Distribution
 if [ -f "lib/ant.jar" ] ; then
   rm lib/ant.jar
 fi
+if [ -f "lib/otional.jar" ] ; then
+  rm lib/optional.jar
+fi
 
 # add in the dependency .jar files
 DIRLIBS=${ANT_HOME}/lib/*.jar