diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 8d97cd0aad2..a68908c9cb6 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -491,6 +491,7 @@ SHARE_SRC_DIRS += \
     $(CORBA_TOPDIR)/src/$1/share/classes \
     $(JAXP_TOPDIR)/src/$1/share/classes \
     $(JAXWS_TOPDIR)/src/$1/share/classes \
+    $(NASHORN_TOPDIR)/src/$1/share/classes \
     #
 
 ALL_SRC_DIRS = \
diff --git a/make/Images.gmk b/make/Images.gmk
index 0dfba0f509e..d3b60a22e6b 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -46,9 +46,9 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \
-               jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
-               jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+               jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.hprof.agent jdk.jartool \
+               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PROVIDER_MODULES += jdk.crypto.mscapi
diff --git a/modules.xml b/modules.xml
index 5188fd4c42e..0445602d877 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1799,6 +1799,25 @@
     <depend>java.base</depend>
     <depend>java.logging</depend>
     <depend>java.scripting</depend>
+    <export>
+      <name>jdk.nashorn.internal.runtime</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.internal.objects</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.tools</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.scripting.nashorn.shell</name>
+    <depend>java.base</depend>
+    <depend>java.prefs</depend>
+    <depend>jdk.scripting.nashorn</depend>
+    <depend>jdk.internal.le</depend>
   </module>
   <module>
     <name>jdk.sctp</name>