diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 0b2aacac7fc..2fd08b185b9 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -321,3 +321,4 @@ c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
 d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
 7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77
 8c40d4143ee13bdf8170c68cc384c36ab1e9fadb jdk9-b78
+ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index ef5c8bed04e..c5909fb6089 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -481,3 +481,4 @@ fff6b54e9770ac4c12c2fb4cab5aa7672affa4bd jdk9-b74
 0bc8d1656d6f2b1fdfe803c1305a108bb9939f35 jdk9-b76
 e66c3813789debfc06f206afde1bf7a84cb08451 jdk9-b77
 20dc06b04fe5ec373879414d60ef82ac70faef98 jdk9-b78
+e9e63d93bbfe2c6c23447e2c1f5cc71c98671cba jdk9-b79
diff --git a/make/Images.gmk b/make/Images.gmk
index 36b889e96a4..c404a89ee3b 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -39,14 +39,14 @@ $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
 
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
-               jdk.accessibility
+               jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
                jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
                jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
diff --git a/modules.xml b/modules.xml
index 9259443888a..2f8ecea1bd3 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1652,6 +1652,10 @@
       <name>jdk.internal.jline.console.history</name>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
+    <export>
+      <name>jdk.internal.jline.internal</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
   </module>
   <module>
     <name>jdk.jartool</name>
@@ -1818,7 +1822,9 @@
     <name>jdk.scripting.nashorn.shell</name>
     <depend>java.base</depend>
     <depend>jdk.scripting.nashorn</depend>
-    <depend>jdk.internal.le</depend>
+    <depend>jdk.internal.le</depend> <!-- jline -->
+    <depend>java.desktop</depend> <!-- EditPad -->
+    <depend>java.compiler</depend> <!-- java package completion -->
   </module>
   <module>
     <name>jdk.sctp</name>