--- a/make/Docs.gmk	Fri May 12 19:11:14 2017 +0200
+++ b/make/Docs.gmk	Fri May 12 13:29:22 2017 -0700
@@ -165,6 +165,11 @@
     $(VERSION_SPECIFICATION)<br>API Specification
 
 ################################################################################
+
+JDK_DOCS_INDEX_HTML_TITLE := Java&trade; Platform, Standard Edition Development Kit \
+    (JDK&trade;) $(VERSION_SPECIFICATION) Specification<br>$(DRAFT_MARKER_TITLE)
+
+################################################################################
 # Functions
 
 # Helper function for creating a png file from a dot file generated by the
@@ -357,6 +362,18 @@
 # JAVASE_API_MODULEGRAPH_TARGETS.
 
 ################################################################################
+
+JDK_DOCS_INDEX_HTML := $(DOCS_OUTPUTDIR)/index.html
+
+$(JDK_DOCS_INDEX_HTML): $(BUILD_JIGSAW_TOOLS)
+	$(call LogInfo, Generating docs bundle index page)
+	$(MKDIR) -p $(@D)
+	$(TOOL_GEN_DOCS_BUNDLE_PAGE) --title '$(JDK_DOCS_INDEX_HTML_TITLE)' \
+		--output $@
+
+JDK_DOCS_INDEX_HTML_TARGETS := $(JDK_DOCS_INDEX_HTML)
+
+################################################################################
 # Copy JDK specs files
 
 # For all html documentation in $module/share/specs directories, copy it
@@ -454,10 +471,13 @@
 
 docs-jdk-specs: $(JDK_SPECS_TARGETS)
 
+docs-jdk-index: $(JDK_DOCS_INDEX_HTML_TARGETS)
+
 docs-zip: $(ZIP_TARGETS)
 
 all: docs-jdk-api-javadoc docs-jdk-api-modulegraph docs-javase-api-javadoc \
-    docs-javase-api-modulegraph docs-jdk-specs docs-zip
+    docs-javase-api-modulegraph docs-jdk-specs docs-jdk-index docs-zip
 
 .PHONY: default all docs-jdk-api-javadoc docs-jdk-api-modulegraph \
-    docs-javase-api-javadoc docs-javase-api-modulegraph docs-jdk-specs docs-zip
+    docs-javase-api-javadoc docs-javase-api-modulegraph docs-jdk-specs \
+    docs-jdk-index docs-zip