--- a/make/common/Modules.gmk	Tue Dec 13 02:04:18 2016 +0100
+++ b/make/common/Modules.gmk	Sun Dec 18 15:57:40 2016 +0100
@@ -83,9 +83,6 @@
 NON_UPGRADEABLE_MODULES +=
 
 AGGREGATOR_MODULES += \
-    java.compact1 \
-    java.compact2 \
-    java.compact3 \
     java.se \
     java.se.ee \
     #
@@ -107,7 +104,7 @@
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \
-    jdk.crypto.pkcs11 \
+    jdk.crypto.token \
     jdk.desktop \
     jdk.dynalink \
     jdk.jsobject \
@@ -122,7 +119,7 @@
 
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
-    jdk.pack200 \
+    jdk.pack \
     jdk.scripting.nashorn.shell \
     #
 
@@ -300,6 +297,21 @@
 
 ################################################################################
 
+LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal
+ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
+  LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
+endif
+LEGAL_SUBDIRS += share/legal
+
+# Find all legal dirs for a particular module
+# $1 - Module to find legal dirs for
+FindModuleLegalDirs = \
+    $(strip $(wildcard \
+        $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
+        $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+
+################################################################################
+
 # Param 1 - Name of module
 define ReadSingleImportMetaData
     ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), )