diff --git a/make/Images.gmk b/make/Images.gmk
index ca6a4e2d8bf..094f9429920 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -42,7 +42,7 @@ MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
                jdk.accessibility jdk.internal.le jdk.dynalink \
                jdk.scripting.nashorn jdk.scripting.nashorn.shell \
-               jdk.vm.ci jdk.management
+               jdk.vm.ci jdk.management jdk.jsobject
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.jvmstat.rmi \
diff --git a/modules.xml b/modules.xml
index 75a523a8cc8..d1b092aaff3 100644
--- a/modules.xml
+++ b/modules.xml
@@ -843,6 +843,18 @@
       <name>jdk.jshell</name>
     </export>
   </module>
+  <module>
+    <name>jdk.jsobject</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <export>
+      <name>netscape.javascript</name>
+    </export>
+    <export>
+      <name>jdk.internal.netscape.javascript.spi</name>
+      <to>jdk.plugin</to>
+    </export>
+  </module>
   <module>
     <name>java.httpclient</name>
     <depend>java.base</depend>
@@ -1802,10 +1814,10 @@
       <name>com.sun.tools.javadoc</name>
     </export>
     <export>
-      <name>jdk.javadoc.doclet</name>  
+      <name>jdk.javadoc.doclet</name>
     </export>
     <export>
-      <name>jdk.javadoc.doclet.taglet</name>  
+      <name>jdk.javadoc.doclet.taglet</name>
     </export>
   </module>
   <module>