diff -r 973e43884dba -r d706d00a2719 make/Javadoc.gmk
--- a/make/Javadoc.gmk	Mon Dec 19 12:39:00 2016 -0500
+++ b/make/Javadoc.gmk	Tue Dec 20 13:44:04 2016 -0800
@@ -577,12 +577,13 @@
     PACKAGES := \
         jdk.jshell \
         jdk.jshell.spi \
-        jdk.jshell.execution, \
+        jdk.jshell.execution \
+        jdk.jshell.tool, \
     API_ROOT := jdk, \
     DEST_DIR := jshell, \
-    OVERVIEW := $(LANGTOOLS_TOPDIR)/src/jdk.jshell/share/classes/jdk/jshell/overview.html, \
     TITLE := JShell API, \
     FIRST_COPYRIGHT_YEAR := 2015, \
+    SPLIT_INDEX := TRUE, \
 ))
 
 TARGETS += $(jshellapi)