--- a/make/common/NON_CORE_PKGS.gmk	Thu Jan 28 19:42:10 2016 +0300
+++ b/make/common/NON_CORE_PKGS.gmk	Thu Nov 12 13:26:07 2015 -0800
@@ -66,7 +66,10 @@
 
 NIO_PKGS = com.sun.nio.file
 
-DOCLETAPI_PKGS = com.sun.javadoc
+OLD_DOCLETAPI_PKGS = com.sun.javadoc
+
+DOCLETAPI_PKGS = jdk.javadoc.doclet \
+    jdk.javadoc.doclet.taglet
 
 TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java