--- old/make/Javadoc.gmk	2015-01-08 11:55:26.975253858 +0530
+++ new/make/Javadoc.gmk	2015-01-08 11:55:26.771252838 +0530
@@ -1116,14 +1116,15 @@
 NASHORNAPI_HEADER := <strong>Nashorn API</strong>
 NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
 NASHORNAPI_GROUPNAME := Packages
-NASHORNAPI_REGEXP := com.sun.source.*
+NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
+
 # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
-NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
+NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
 
-treeapidocs: $(NASHORNAPI_INDEX_HTML)
+nashornapidocs: $(NASHORNAPI_INDEX_HTML)
 
 # Set relative location to core api document root
 $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..