From 98f7893e8331c0cf0b4489397ff8a4e7f6901754 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Wed, 22 Jun 2016 17:20:53 -0700
Subject: [PATCH] 8154399: Need replacement for
 jdk.javadoc/com.sun.tools.doclets.standard.Standard 8159096: Expose (new)
 Standard doclet class

Reviewed-by: alanb, erikj, ksrini
---
 make/Javadoc.gmk              | 2 +-
 make/common/NON_CORE_PKGS.gmk | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index d27caaf85f1..4d946139940 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -463,7 +463,7 @@ DOCLETAPI_WINDOWTITLE := Doclet API
 DOCLETAPI_HEADER := <strong>Doclet API</strong>
 DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
 DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := jdk.javadoc.doclet.*
+DOCLETAPI_REGEXP := jdk.javadoc.doclet*
 # DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk
index f6fbcd3a63b..b6ef5a9d450 100644
--- a/make/common/NON_CORE_PKGS.gmk
+++ b/make/common/NON_CORE_PKGS.gmk
@@ -69,7 +69,8 @@ NIO_PKGS = com.sun.nio.file
 OLD_DOCLETAPI_PKGS = com.sun.javadoc
 
 DOCLETAPI_PKGS = jdk.javadoc.doclet \
-    jdk.javadoc.doclet.taglet
+    jdk.javadoc.doclet.taglet \
+    jdk.javadoc.doclets
 
 TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java