diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 1dcda98fea..586bc61ce4 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -352,11 +352,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <!--
-          Do not upgrade to 3.1.0 because it has troubles with "Automatic-Module-Name"
-          See https://issues.apache.org/jira/browse/MJAVADOC-588
-          -->
-          <version>3.0.1</version>
+          <version>3.6.3</version>
           <configuration>
             <quiet>true</quiet>
             <detectOfflineLinks>false</detectOfflineLinks>
diff --git a/org.jacoco.doc/pom.xml b/org.jacoco.doc/pom.xml
index 5aa3fd9721..3e161a8471 100644
--- a/org.jacoco.doc/pom.xml
+++ b/org.jacoco.doc/pom.xml
@@ -200,7 +200,7 @@
             <configuration>
               <reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
               <includeDependencySources>true</includeDependencySources>
-              <excludePackageNames>*.internal,org.jacoco.ant,org.jacoco.maven,org.jacoco.examples</excludePackageNames>
+              <excludePackageNames>*.internal.*,*.internal,org.jacoco.ant,org.jacoco.maven,org.jacoco.examples</excludePackageNames>
               <dependencySourceIncludes>
                 <dependencySourceInclude>org.jacoco:*</dependencySourceInclude>
               </dependencySourceIncludes>