--- a/make/Javadoc.gmk	Fri Jul 01 16:50:32 2016 -0700
+++ b/make/Javadoc.gmk	Wed Jul 06 20:56:27 2016 -0700
@@ -1223,8 +1223,7 @@
 JSHELLAPI_WINDOWTITLE := JShell API
 JSHELLAPI_HEADER := <strong>JSHELL API</strong>
 JSHELLAPI_BOTTOM := $(call CommonBottom,$(JSHELLAPI_FIRST_COPYRIGHT_YEAR))
-JSHELLAPI_GROUPNAME := Packages
-JSHELLAPI_REGEXP := jdk.jshell.*
+JSHELLAPI_OVERVIEW := $(LANGTOOLS_TOPDIR)/src/jdk.jshell/share/classes/jdk/jshell/overview.html
 # JSHELLAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 JSHELLAPI_INDEX_HTML = $(JSHELLAPI_DOCDIR)/index.html
@@ -1256,11 +1255,11 @@
 	  $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
 	  $(call OptionPair,-addmods,$(JSHELLAPI_MODULES)) ; \
 	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionPair,-overview,$(JSHELLAPI_OVERVIEW)) ; \
 	  $(call OptionPair,-doctitle,$(JSHELLAPI_DOCTITLE)) ; \
 	  $(call OptionPair,-windowtitle,$(JSHELLAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
 	  $(call OptionPair,-header,$(JSHELLAPI_HEADER)$(DRAFT_HEADER)) ; \
 	  $(call OptionPair,-bottom,$(JSHELLAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(JSHELLAPI_GROUPNAME),$(JSHELLAPI_REGEXP)); \
 	  $(call OptionTrip,-linkoffline,$(JSHELLAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
 	) >> $@
 

--- a/make/common/NON_CORE_PKGS.gmk	Fri Jul 01 16:50:32 2016 -0700
+++ b/make/common/NON_CORE_PKGS.gmk	Wed Jul 06 20:56:27 2016 -0700
@@ -81,7 +81,9 @@
 
 JCONSOLE_PKGS = com.sun.tools.jconsole
 
-JSHELLAPI_PKGS = jdk.jshell
+JSHELLAPI_PKGS = jdk.jshell \
+    jdk.jshell.spi \
+    jdk.jshell.execution
 
 TREEAPI_PKGS = com.sun.source.doctree \
     com.sun.source.tree \