--- old/make/CreateJmods.gmk	2016-12-07 23:01:22.000000000 -0800
+++ new/make/CreateJmods.gmk	2016-12-07 23:01:22.000000000 -0800
@@ -79,6 +79,15 @@
   DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
+LEGAL_NOTICES := \
+  $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
+  $(call FindModuleLegalDirs, $(MODULE))
+
+LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
+DEPS += $(call CacheFind, $(LEGAL_NOTICES))
+
+JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
+
 # Add dependencies on other jmod files. Only java.base needs access to other
 # jmods.
 ifeq ($(MODULE), java.base)
@@ -112,7 +121,6 @@
   DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
 endif
 
-# TODO: What about headers?
 # Create jmods in a temp dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
 $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)