diff --git a/Makefile b/Makefile
index f9162f0b6413edfb1fc1058b094121aaeb459413..f7b9d1b35e3ae0b1c2fae5701cc5519f7e00e018 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ include ./make/corba-rules.gmk
 include ./make/jaxp-rules.gmk
 include ./make/jaxws-rules.gmk
 include ./make/jdk-rules.gmk
+include ./make/nashorn-rules.gmk
 include ./make/install-rules.gmk
 include ./make/sponsors-rules.gmk
 include ./make/deploy-rules.gmk
@@ -174,6 +175,11 @@ ifeq ($(BUILD_JDK), true)
   clobber:: jdk-clobber
 endif
 
+ifeq ($(BUILD_NASHORN), true)
+  generic_build_repo_series:: $(NASHORN)
+  clobber:: nashorn-clobber
+endif
+
 ifeq ($(BUILD_DEPLOY), true)
   generic_build_repo_series:: $(DEPLOY)
   clobber:: deploy-clobber
@@ -336,6 +342,7 @@ deploy_fastdebug_only:
 	    BUILD_HOTSPOT=false \
 	    BUILD_JDK=false \
 	    BUILD_LANGTOOLS=false \
+	    BUILD_NASHORN=false \
 	    BUILD_CORBA=false \
 	    BUILD_JAXP=false \
 	    BUILD_JAXWS=false \
diff --git a/make/nashorn-rules.gmk b/make/nashorn-rules.gmk
index a205f2ea97e28a9846c6e22b701a0ab066da3582..a86a0475ced09a4140b958de618f858eeabda977 100644
--- a/make/nashorn-rules.gmk
+++ b/make/nashorn-rules.gmk
@@ -37,6 +37,9 @@ ifeq ($(BUILD_LANGTOOLS), true)
    NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
 endif
 
+# Default targets
+NASHORN = nashorn-build
+
 nashorn: nashorn-build
 nashorn-build:
 	$(MKDIR) -p $(NASHORN_OUTPUTDIR)