diff --git a/build/dist.xml b/build/dist.xml
index bb2c305a1e..2bb1f3a0bf 100644
--- a/build/dist.xml
+++ b/build/dist.xml
@@ -10,7 +10,6 @@
                  version="true"
                  windowtitle="${Name} API"
                  doctitle="${Name}"
-                 extdirs="${module.thirdparty}"
                  additionalparam="${javadoc.additionalparam}"
                  excludepackagenames="${excludedPackages}"
                  bottom="Copyright © 2001-${YEAR} Jaybird (Firebird JDBC/JCA) team. All rights reserved.">
diff --git a/build/init.xml b/build/init.xml
index d5649c7d2f..b264690254 100644
--- a/build/init.xml
+++ b/build/init.xml
@@ -238,9 +238,15 @@
          disabling seems to be the better option.
          For details see: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
         -->
-        <condition property="javadoc.additionalparam" value="-Xdoclint:none" else="">
+        <condition property="javadoc.additionalparam" value="">
+            <javaversion exactly="1.7"/>
+        </condition>
+        <condition property="javadoc.additionalparam" value="-Xdoclint:none">
             <javaversion exactly="1.8"/>
         </condition>
+        <condition property="javadoc.additionalparam" value="-Xdoclint:none --no-module-directories">
+            <javaversion atleast="9"/>
+        </condition>
 
     </target>