diff --git a/pom.xml b/pom.xml
index c59a0a8181..894c4acc87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,9 @@
         <plugins>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>${javadoc.opts}</additionalparam>
+            </configuration>
             <executions>
               <execution>
                 <id>javadoc</id>
diff --git a/project/pom.xml b/project/pom.xml
index e170d54820..bdefe7dfa1 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -886,6 +886,7 @@
                   <encoding>${project.build.sourceEncoding}</encoding>
                   <quiet>true</quiet>
                   <maxmemory>512m</maxmemory>
+                  <additionalparam>${javadoc.opts}</additionalparam>
                 </configuration>
                 <reportSets>
                   <reportSet>
@@ -987,6 +988,7 @@
             <maxmemory>512m</maxmemory>
             <encoding>${project.build.sourceEncoding}</encoding>
             <quiet>true</quiet>
+            <additionalparam>${javadoc.opts}</additionalparam>
             <links>
               <link>https://download.oracle.com/javase/6/docs/api/</link>
             </links>
@@ -1208,6 +1210,15 @@
     </plugins>
   </reporting>
   <profiles>
+    <profile>
+      <id>disable-doclint</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+      </properties>
+    </profile>
     <profile>
       <id>live</id>
       <build>
@@ -1421,6 +1432,9 @@
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.9</version>
+            <configuration>
+              <additionalparam>${javadoc.opts}</additionalparam>
+            </configuration>
             <executions>
               <execution>
                 <id>javadoc</id>