--- old/make/common/Modules.gmk	2019-05-02 13:41:39.835580900 -0400
+++ new/make/common/Modules.gmk	2019-05-02 13:41:37.776341300 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -128,6 +128,7 @@
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
     jdk.pack \
+    jdk.jpackage \
     jdk.scripting.nashorn.shell \
     #
 
@@ -168,6 +169,7 @@
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
+    jdk.jpackage \
     jdk.rmic \
     jdk.scripting.nashorn \
     jdk.sctp \
@@ -227,6 +229,13 @@
 endif
 
 ################################################################################
+# jpackage is only on windows, macosx, and linux
+
+ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx linux), )
+  MODULES_FILTER += jdk.jpackage
+endif
+
+################################################################################
 # Module list macros
 
 # Use append so that the custom extension may add to these variables