--- old/make/common/NON_CORE_PKGS.gmk	Fri Jan 22 12:27:26 2016
+++ new/make/common/NON_CORE_PKGS.gmk	Fri Jan 22 12:27:26 2016
@@ -66,8 +66,11 @@
 
 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
 
 TAGLETAPI_PKGS = com.sun.tools.doclets