diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index fa35aec5858..aaae670d176 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -348,3 +348,4 @@ c4d72a1620835b5d657b7b6792c2879367d0154f jdk-9+101
 47d6462e514b2097663305a57d9c844c15d5b609 jdk-9+103
 9a38f8b4ba220708db198d08d82fd2144a64777d jdk-9+104
 be58b02c11f90b88c67e4d0e2cb5e4cf2d9b3c57 jdk-9+105
+54575d8783b3a39a2d710c28cda675d44261f9d9 jdk-9+106
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 05093f4612a..0e0be3fc47e 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -212,6 +212,11 @@ JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
 PLATFORM_DOCSDIR = $(DOCSDIR)/platform
 
+# The core api index file is the target for the core api javadocs rule
+# and needs to be defined early so that all other javadoc rules may
+# depend on it.
+COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+
 # The non-core api javadocs need to be able to access the root of the core
 # api directory, so for jdk/api or jre/api to get to the core api/
 # directory we would use this:
@@ -363,8 +368,7 @@ COREAPI_HEADER = \
 # Overview file for core apis
 COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html
 
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+# The options and packages files
 COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
 COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
 
diff --git a/modules.xml b/modules.xml
index e0da33a70fc..458859b5327 100644
--- a/modules.xml
+++ b/modules.xml
@@ -239,6 +239,7 @@
       <to>java.xml</to>
       <to>jdk.charsets</to>
       <to>jdk.management.resource</to>
+      <to>jdk.net</to>
       <to>jdk.scripting.nashorn</to>
       <to>jdk.vm.ci</to>
     </export>
@@ -319,6 +320,10 @@
       <to>java.security.jgss</to>
       <to>jdk.naming.dns</to>
     </export>
+    <export>
+      <name>sun.net.sdp</name>
+      <to>jdk.net</to>
+    </export>
     <export>
       <name>sun.net.spi.nameservice</name>
       <to>jdk.naming.dns</to>
@@ -345,6 +350,7 @@
       <to>jdk.crypto.pkcs11</to>
       <to>jdk.crypto.ucrypto</to>
       <to>jdk.management.resource</to>
+      <to>jdk.net</to>
       <to>jdk.sctp</to>
     </export>
     <export>