diff --git a/pom.xml b/pom.xml
index 8acdac8..6317791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,22 @@
         <maven.compiler.target>1.7</maven.compiler.target>
 
         <github.global.server>github</github.global.server>
+
+        <javadoc.opts><!-- Only jdk 1.8 and later --></javadoc.opts>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>doclint-java8</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <javadoc.opts>-Xdoclint:none</javadoc.opts>
+            </properties>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>spigot-repo</id>
@@ -66,6 +80,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.10.4</version>
+                <configuration>
+                    <additionalparam>${javadoc.opts}</additionalparam>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>