diff --git a/bootstrap.bat b/bootstrap.bat
index 1d79958d25..39f7165efc 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -46,6 +46,7 @@ set TOOLS=src\main\org\apache\tools
set CLASSDIR=build\classes
SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
+SET BOOTJAVAC_OPTS="-proc:none %BOOTJAVAC_OPTS%"
echo JAVA_HOME=%JAVA_HOME%
echo JAVA=%JAVA%
diff --git a/bootstrap.sh b/bootstrap.sh
index c97abb328b..6c91d35b9a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -115,6 +115,7 @@ TOOLS=src/main/org/apache/tools
CLASSDIR=build/classes
CLASSPATH=${CLASSDIR}:src/main:${CLASSPATH}
+BOOTJAVAC_OPTS="-proc:none ${BOOTJAVAC_OPTS}"
# For Cygwin, switch to Windows format before running java
if $cygwin; then
diff --git a/build.xml b/build.xml
index 02f86e5c6f..fdaa945247 100644
--- a/build.xml
+++ b/build.xml
@@ -660,6 +660,7 @@
source="${javac.source}"
release="${javac.release}"
optimize="${optimize}">
+
@@ -713,6 +714,7 @@
source="${javac.source}"
release="${javac.release}"
optimize="${optimize}">
+
@@ -763,6 +765,7 @@
target="${javac.target}"
source="${javac.source}"
optimize="${optimize}">
+
@@ -1638,6 +1641,7 @@
source="${javac.source}"
release="${javac.release}"
deprecation="${deprecation}">
+