diff --git a/build.gradle b/build.gradle
index 03b4d8beca1..ec56eba62d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -285,7 +285,6 @@ subprojects { project ->
 
     apply plugin: 'java-library'
     apply plugin: 'groovy'
-//    apply plugin: "io.github.groovylang.groovydoc"
     if(!isTestSuite) {
         apply plugin: 'com.bmuschko.nexus'
         apply plugin: 'maven-publish'
@@ -431,7 +430,6 @@ subprojects { project ->
             !isTestSuite
         })
         classpath += configurations.documentation
-//        jvmArgs "-Xmx512M"
     }
 
     configure([javadoc]) {
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 1eeff437fb1..e785ba3552b 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -80,13 +80,12 @@ tasks.withType(Groovydoc) {
     // http://www.adam-bien.com/roller/abien/entry/trouble_with_crippled_java_ee
     groovydocClasspath -= groovydocClasspath.filter { it.name == 'javaee-web-api-6.0.jar' }
 
-    classpath = groovydocClasspath
-    groovyClasspath = groovydocClasspath
+    classpath += groovydocClasspath
+    groovyClasspath += groovydocClasspath
     destinationDir = file("$docs.destinationDir/api")
     windowTitle = "Grails $grailsVersion"
     docTitle = "Grails $grailsVersion"
     source subs.sourceSets.main.groovy.srcDirs
-    jvmArgs "-Xmx768M"
 // Can't make these link methods to work
 //    link("http://static.springsource.org/spring/docs/3.0.x/javadoc-api", "org.springframework.")
 //    link("http://download.oracle.com/javase/1.5.0/docs/api", "java." , "javax.")