diff --git a/WHATSNEW b/WHATSNEW
index 43ec62a77..413f07f7a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -444,6 +444,8 @@ Other changes:
 * Minor performance updates. Bugzilla report 39565.
 
 * New deleteonexit attribute for the <tempfile> task. Bugzilla report 39842.
+  Remember that the exit of the JVM can be a long time coming, especially under an
+  IDE. Don't rely on this being called.
 
 * <scriptdef>-created scripts have support for nested text. All text
   passed to a scripted task can be accessed via self.text.
@@ -452,6 +454,9 @@ Other changes:
 
 * <junitreport> now supports nested XSL parameters. Bugzilla report 39708.
 
+* <javacc> has a jdkversion attribute to pass the desired JDK version down to javacc.
+  Bugzilla report 38715.
+
 Changes from Ant 1.6.4 to Ant 1.6.5
 ===================================
 
diff --git a/docs/manual/OptionalTasks/javacc.html b/docs/manual/OptionalTasks/javacc.html
index 9bffb53e7..58f1bf3e3 100644
--- a/docs/manual/OptionalTasks/javacc.html
+++ b/docs/manual/OptionalTasks/javacc.html
@@ -117,6 +117,10 @@
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
+    <td valign="top">jdkversion</td>
+    <td valign="top">Sets the JDK_VERSION option. This is a string option.</td>
+    <td valign="top" align="center">No</td>
+  </tr>  <tr>
     <td valign="top">keeplinecolumn</td>
     <td valign="top">Sets the KEEP_LINE_COLUMN grammar option.  This is a boolean option.</td>
     <td valign="top" align="center">No</td>
@@ -178,7 +182,7 @@
 </p>
 <hr>
 
-<p align="center">Copyright &copy; 2000-2001,2003,2005 Apache Software Foundation.
+<p align="center">Copyright &copy; 2000-2001,2003,2006 Apache Software Foundation.
 All rights
 Reserved.</p>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index f24fffa3a..916e201ce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@ public class JavaCC extends Task {
     private static final String FORCE_LA_CHECK         = "FORCE_LA_CHECK";
     private static final String CACHE_TOKENS           = "CACHE_TOKENS";
     private static final String KEEP_LINE_COLUMN       = "KEEP_LINE_COLUMN";
+    private static final String JDK_VERSION            = "JDK_VERSION";
 
     private final Hashtable optionalAttrs = new Hashtable();
 
@@ -249,6 +250,14 @@ public class JavaCC extends Task {
         optionalAttrs.put(KEEP_LINE_COLUMN, new Boolean(keepLineColumn));
     }
 
+    /**
+     * Sets the JDK_VERSION option.
+     * @since Ant1.7
+     */
+    public void setJDKversion(String jdkVersion) {
+        optionalAttrs.put(JDK_VERSION, jdkVersion);
+    }
+
     /**
      * The directory to write the generated files to.
      * If not set, the files are written to the directory