diff --git a/icu4j/demos/src/com/ibm/icu/dev/demo/calendar/package.html b/icu4j/demos/src/com/ibm/icu/dev/demo/calendar/package.html
index c1bb1050957..5f8a16238ef 100644
--- a/icu4j/demos/src/com/ibm/icu/dev/demo/calendar/package.html
+++ b/icu4j/demos/src/com/ibm/icu/dev/demo/calendar/package.html
@@ -1,6 +1,9 @@
+
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/ICUConfig.properties b/icu4j/main/classes/core/src/com/ibm/icu/ICUConfig.properties
index 9c487993cb1..917b66ea047 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/ICUConfig.properties
+++ b/icu4j/main/classes/core/src/com/ibm/icu/ICUConfig.properties
@@ -1,5 +1,9 @@
#*
#*******************************************************************************
+# Copyright (C) 2016 and later: Unicode, Inc. and others. *
+# License & terms of use: http://www.unicode.org/copyright.html#License *
+#*******************************************************************************
+#*******************************************************************************
#* Copyright (C) 2008-2014, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/data/package.html b/icu4j/main/classes/core/src/com/ibm/icu/impl/data/package.html
index 4f9bcd30952..7914c078bf7 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/data/package.html
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/data/package.html
@@ -1,6 +1,9 @@
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml.escaped b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml.escaped
index 63bc4f92a76..97db5914c28 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml.escaped
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml.escaped
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_en.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_en.xml
index 49b24f70323..d802a9d1a0d 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_en.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_en.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_es.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_es.xml
index b1473e3b6d9..b3ec83e3b9f 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_es.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_es.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_fr.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_fr.xml
index 0809dd2be65..e1d314b8170 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_fr.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_fr.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_he_IL.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_he_IL.xml
index 4018d0d6c1b..7a879623284 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_he_IL.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_he_IL.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_hi.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_hi.xml
index 6222ef5259f..002f71b054b 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_hi.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_hi.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_it.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_it.xml
index 245a317931b..0d99c71e442 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_it.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_it.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ja.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ja.xml
index a309ce8f2a0..2070f13b727 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ja.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ja.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ko.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ko.xml
index 32de9a78850..1323562dd9e 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ko.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ko.xml
@@ -1,9 +1,13 @@
NONE
@@ -90,4 +94,4 @@
false
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ru.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ru.xml
index 55dc35202d5..7dc9d5f70cd 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ru.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_ru.xml
@@ -1,7 +1,11 @@
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_th.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_th.xml
index f45365178e1..86ae843a889 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_th.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_th.xml
@@ -1,7 +1,11 @@
@@ -115,4 +119,4 @@
กว่าๆ
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans.xml
index b3f60aefe0d..adae42011a1 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans.xml
@@ -1,7 +1,11 @@
@@ -129,4 +133,4 @@
以后
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml
index bb8eca8b84b..1bcc983c5fe 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml
@@ -1,7 +1,11 @@
@@ -127,4 +131,4 @@
以后
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml
index 8b84f235af1..d1093de93ab 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml
@@ -1,7 +1,11 @@
@@ -127,4 +131,4 @@
以後
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml
index e474dee3cee..18cac3f2fc3 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml
@@ -1,7 +1,11 @@
@@ -113,4 +117,4 @@
之後
-
\ No newline at end of file
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/package.html b/icu4j/main/classes/core/src/com/ibm/icu/lang/package.html
index 913282d7242..4931e23fd1b 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/package.html
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/package.html
@@ -1,6 +1,10 @@
-
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/math/package.html b/icu4j/main/classes/core/src/com/ibm/icu/math/package.html
index 6336ead66f8..03bc682df45 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/math/package.html
+++ b/icu4j/main/classes/core/src/com/ibm/icu/math/package.html
@@ -1,7 +1,11 @@
-
+
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/package.html b/icu4j/main/classes/core/src/com/ibm/icu/text/package.html
index 6bd070d15c6..0956c732db0 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/package.html
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/package.html
@@ -1,6 +1,9 @@
+
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
index 3a703cb10b6..366362db280 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
@@ -1,4 +1,8 @@
-# Copyright (c) 2012-2015 International Business Machines
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html#License
+#
+# Corporation and others. All Rights Reserved.
+# Copyright (c) 2012-2015 International Business Machines
# Corporation and others. All Rights Reserved.
#
# This file should be in UTF-8 with a signature byte sequence ("BOM").
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/package.html b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/package.html
index f85a4e77a46..10d358bfe02 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/package.html
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/package.html
@@ -1,6 +1,9 @@
+
+
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/compression/package.html b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/compression/package.html
index 426bc941e6c..b8f3a634b63 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/compression/package.html
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/compression/package.html
@@ -1,6 +1,9 @@
+