diff --git a/WHATSNEW b/WHATSNEW
index a4bc01cb5..1e25ba617 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -48,6 +48,10 @@ instance of this class are going to fail.
 name attribute to be a single pattern, they don't accept multiple
 patterns anymore. Split them into multiple elements of the same type.
 
+* <delete dir="somedir" /> will now delete the directory itself as
+well as all included files. If you just want to clean out the
+directory and keep the empty one, use a nested fileset.
+
 Other changes:
 --------------
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 261e7f059..da53e2d6d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,6 +5,10 @@
 ANT_HOME=.
 export ANT_HOME
 
+if [ -z "$JAVAC" ] ; then
+  JAVAC=javac;
+fi
+
 echo ... Bootstrapping Ant Distribution
 
 if test -f lib/ant.jar ; then
@@ -44,10 +48,10 @@ mkdir -p ${CLASSDIR}
 
 echo ... Compiling Ant Classes
 
-javac  -d ${CLASSDIR} ${TOOLS}/tar/*.java
-javac  -d ${CLASSDIR} ${TOOLS}/ant/types/*.java
-javac  -d ${CLASSDIR} ${TOOLS}/ant/*.java
-javac  -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/types/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
 
 echo ... Copying Required Files
 
@@ -55,7 +59,7 @@ cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/ap
 
 echo ... Building Ant Distribution
 
-java org.apache.tools.ant.Main clean main bootstrap
+java org.apache.tools.ant.Main clean main bootstrap $JIKESON
 
 echo ... Cleaning Up Build Directories