diff --git a/spark/sql-13/build.gradle b/spark/sql-13/build.gradle
index 9bb8349cd..25f0d3a3f 100644
--- a/spark/sql-13/build.gradle
+++ b/spark/sql-13/build.gradle
@@ -12,6 +12,14 @@ variants {
     targetVersions '2.11.12'
 }
 
+configurations {
+    scalaCompilerPlugin {
+        defaultDependencies { dependencies ->
+            dependencies.add(project.dependencies.create( "com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
+        }
+    }
+}
+
 println "Compiled using Scala ${project.ext.scalaMajorVersion} [${project.ext.scalaVersion}]"
 String sparkVersion = spark13Version
 
@@ -116,7 +124,9 @@ jar {
 }
 
 javadoc {
+    dependsOn compileScala
     source += project(":elasticsearch-hadoop-mr").sourceSets.main.allJava
+    source += "$buildDir/generated/java"
     classpath += files(project(":elasticsearch-hadoop-mr").sourceSets.main.compileClasspath)
 }
 
@@ -142,3 +152,12 @@ configurations.all { Configuration conf ->
 
     conf.exclude group: "org.mortbay.jetty"
 }
+
+tasks.withType(ScalaCompile) {
+    scalaCompileOptions.with {
+        additionalParameters = [
+                "-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
+                "-P:genjavadoc:out=$buildDir/generated/java".toString()
+        ]
+    }
+}
\ No newline at end of file
diff --git a/spark/sql-20/build.gradle b/spark/sql-20/build.gradle
index 4bb82db68..06f280713 100644
--- a/spark/sql-20/build.gradle
+++ b/spark/sql-20/build.gradle
@@ -12,6 +12,14 @@ variants {
     targetVersions '2.11.12'
 }
 
+configurations {
+    scalaCompilerPlugin {
+        defaultDependencies { dependencies ->
+            dependencies.add(project.dependencies.create( "com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
+        }
+    }
+}
+
 println "Compiled using Scala ${project.ext.scalaMajorVersion} [${project.ext.scalaVersion}]"
 String sparkVersion = spark20Version
 
@@ -129,7 +137,9 @@ jar {
 }
 
 javadoc {
+    dependsOn compileScala
     source += project(":elasticsearch-hadoop-mr").sourceSets.main.allJava
+    source += "$buildDir/generated/java"
     classpath += files(project(":elasticsearch-hadoop-mr").sourceSets.main.compileClasspath)
 }
 
@@ -140,3 +150,12 @@ sourcesJar {
 scaladoc {
     title = "${rootProject.description} ${version} API"
 }
+
+tasks.withType(ScalaCompile) {
+    scalaCompileOptions.with {
+        additionalParameters = [
+                "-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
+                "-P:genjavadoc:out=$buildDir/generated/java".toString()
+        ]
+    }
+}
\ No newline at end of file