--- a/modules.xml	Mon Aug 10 09:47:35 2015 +0200
+++ b/modules.xml	Thu Aug 13 19:09:59 2015 +0530
@@ -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>