--- a/jdk/make/copy/Copy-java.base.gmk	Tue Dec 13 09:55:38 2016 +0800
+++ b/jdk/make/copy/Copy-java.base.gmk	Mon Dec 12 18:56:50 2016 -0800
@@ -233,3 +233,17 @@
 endif
 
 ################################################################################
+
+# JDK license and assembly exception files to be packaged in JMOD
+
+JDK_LICENSE ?= $(JDK_TOPDIR)/LICENSE
+JDK_NOTICE  ?= $(JDK_TOPDIR)/ASSEMBLY_EXCEPTION
+
+$(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \
+    FILES := $(JDK_LICENSE) $(JDK_NOTICE), \
+    DEST := $(LEGAL_DST_DIR), \
+    FLATTEN := true, \
+))
+
+TARGETS += $(COPY_JDK_NOTICES)
+