diff --git a/build.gradle b/build.gradle
index 8d6d420ba1..2a127ba151 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         classpath("org.springframework.build.gradle:bundlor-plugin:0.1.2")
         classpath("org.gradle.api.plugins:gradle-tomcat-plugin:0.9.8")
         classpath("org.asciidoctor:asciidoctor-gradle-plugin:0.4.1")
+        classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
     }
 }
 
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 099eb2cae8..c6125a5538 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -1,6 +1,7 @@
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
 apply plugin: 'java'
+apply plugin: 'javadocHotfix'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'propdeps'
 apply plugin: 'propdeps-maven'