diff --git a/NOTICE b/NOTICE
index 713e04ae4..37f3cf48f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
    Apache Ant
-   Copyright 1999-2010 The Apache Software Foundation
+   Copyright 1999-2011 The Apache Software Foundation
 
    The <sync> task is based on code Copyright (c) 2002, Landmark
    Graphics Corp that has been kindly donated to the Apache Software
diff --git a/WHATSNEW b/WHATSNEW
index 25e5c2f74..867810bd6 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -10,6 +10,10 @@ Fixed bugs:
 Other changes:
 --------------
 
+ * The <javacc>, <jjtree> and <jjdoc> now support a new maxmemory
+   attribute.
+   Bugzilla Report 50513.
+
 Changes from Ant 1.8.1 TO Ant 1.8.2
 ===================================
 
diff --git a/docs/manual/Tasks/javacc.html b/docs/manual/Tasks/javacc.html
index 26f9de8e6..3c0dcfa85 100644
--- a/docs/manual/Tasks/javacc.html
+++ b/docs/manual/Tasks/javacc.html
@@ -181,6 +181,12 @@
     <td valign="top">Sets the USER_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Example</h3>
 <blockquote><pre>
diff --git a/docs/manual/Tasks/jjdoc.html b/docs/manual/Tasks/jjdoc.html
index fdecc9e3f..52b922570 100644
--- a/docs/manual/Tasks/jjdoc.html
+++ b/docs/manual/Tasks/jjdoc.html
@@ -95,6 +95,13 @@ option.</td>
 
 <td ALIGN=CENTER VALIGN=TOP>No</td>
 </tr>
+
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>
diff --git a/docs/manual/Tasks/jjtree.html b/docs/manual/Tasks/jjtree.html
index 4787faad6..7fbb2a9f8 100644
--- a/docs/manual/Tasks/jjtree.html
+++ b/docs/manual/Tasks/jjtree.html
@@ -187,6 +187,13 @@ option.</td>
 
 <td ALIGN=CENTER VALIGN=TOP>No</td>
 </tr>
+
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
index ea5ef230f..a4dc0f484 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
@@ -58,6 +58,7 @@ public class JJDoc extends Task {
 
     private CommandlineJava cmdl = new CommandlineJava();
 
+    private String maxMemory = null;
 
     /**
      * Sets the TEXT BNF documentation option.
@@ -102,6 +103,16 @@ public class JJDoc extends Task {
         this.javaccHome = javaccHome;
     }
 
+    /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
     /**
      * Constructor
      */
@@ -154,8 +165,8 @@ public class JJDoc extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JJDOC));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         final Execute process =
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index 121c39813..f9f23e51b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -67,6 +67,7 @@ public class JJTree extends Task {
 
     private CommandlineJava cmdl = new CommandlineJava();
 
+    private String maxMemory = null;
 
     /**
      * Sets the BUILD_NODE_FILES grammar option.
@@ -192,6 +193,16 @@ public class JJTree extends Task {
         this.javaccHome = javaccHome;
     }
 
+    /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
     /**
      * Constructor
      */
@@ -267,8 +278,8 @@ public class JJTree extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JJTREE));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         final Execute process =
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 d5c1fe17b..219cc9c8d 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
@@ -104,6 +104,8 @@ public class JavaCC extends Task {
     protected static final String ORG_JJTREE_CLASS = COM_JJTREE_CLASS;
     protected static final String ORG_JJDOC_CLASS = COM_JJDOC_CLASS;
 
+    private String maxMemory = null;
+
     /**
      * Sets the LOOKAHEAD grammar option.
      * @param lookahead an <code>int</code> value.
@@ -308,6 +310,16 @@ public class JavaCC extends Task {
         this.javaccHome = javaccHome;
     }
 
+    /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
     /**
      * Constructor
      */
@@ -361,8 +373,8 @@ public class JavaCC extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JAVACC));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         Execute.runCommand(this, cmdl.getCommandline());