diff --git a/bootstrap.bat b/bootstrap.bat
index 4118a8617..31e29af5b 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -50,11 +50,12 @@ echo.
 echo ... Copying Required Files
 
 copy %TOOLS%\ant\taskdefs\*.properties %CLASSDIR%\org\apache\tools\ant\taskdefs
+copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
 
 echo.
 echo ... Building Ant Distribution
 
-%JAVA% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5
+%JAVA% %ANT_OPTS% org.apache.tools.ant.Main clean main bootstrap %1 %2 %3 %4 %5
 
 echo.
 echo ... Cleaning Up Build Directories
diff --git a/bootstrap.sh b/bootstrap.sh
index da53e2d6d..3c5a8c7e0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -56,10 +56,11 @@ ${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
 echo ... Copying Required Files
 
 cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/apache/tools/ant/taskdefs
+cp src/main/org/apache/tools/ant/types/defaults.properties ${CLASSDIR}/org/apache/tools/ant/types
 
 echo ... Building Ant Distribution
 
-java org.apache.tools.ant.Main clean main bootstrap $JIKESON
+java ${ANT_OPTS} org.apache.tools.ant.Main clean main bootstrap
 
 echo ... Cleaning Up Build Directories