--- a/make/common/Modules.gmk	Wed Nov 06 07:20:07 2019 -0500
+++ b/make/common/Modules.gmk	Fri Nov 08 14:53:03 2019 -0500
@@ -128,8 +128,8 @@
 
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
+    jdk.incubator.jpackage \
     jdk.pack \
-    jdk.jpackage \
     jdk.scripting.nashorn.shell \
     #
 
@@ -150,6 +150,7 @@
     jdk.editpad \
     jdk.hotspot.agent \
     jdk.httpserver \
+    jdk.incubator.jpackage \
     jdk.jartool \
     jdk.javadoc \
     jdk.jcmd \
@@ -170,7 +171,6 @@
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
-    jdk.jpackage \
     jdk.rmic \
     jdk.scripting.nashorn \
     jdk.sctp \
@@ -248,7 +248,7 @@
 # jpackage is only on windows, macosx, and linux
 
 ifeq ($(call isTargetOs, windows macosx linux), false)
-  MODULES_FILTER += jdk.jpackage
+  MODULES_FILTER += jdk.incubator.jpackage
 endif
 
 ################################################################################