diff --git a/.gitignore b/.gitignore
index 303ea117652..e779d92e4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/.travis.yml b/.travis.yml
index 53cde555882..8c8b8a84496 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/LICENSE b/LICENSE
index 8b400c7ab81..4889b076134 100644
--- a/LICENSE
+++ b/LICENSE
@@ -331,6 +331,12 @@ only where Oracle has expressly included in the particular source file's header
 the words "Oracle designates this particular file as subject to the "Classpath"
 exception as provided by Oracle in the LICENSE file that accompanied this code."
 
+Certain source files distributed by IBM and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where IBM has expressly included in the particular source file's header
+the words "IBM designates this particular file as subject to the "Classpath"
+exception as provided by IBM in the LICENSE file that accompanied this code."
+
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of
     the GNU General Public License cover the whole combination.
diff --git a/README.md b/README.md
index 631a088da38..28cffc4ffe4 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
index 5a0fb14f1b3..3ddaf65d577 100644
--- a/closed/autoconf/custom-hook.m4
+++ b/closed/autoconf/custom-hook.m4
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in
index e4d6211a22c..429ccc8b388 100644
--- a/closed/autoconf/custom-spec.gmk.in
+++ b/closed/autoconf/custom-spec.gmk.in
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/get_j9_source.sh b/closed/get_j9_source.sh
index f0d7ae80636..9f4c258f417 100644
--- a/closed/get_j9_source.sh
+++ b/closed/get_j9_source.sh
@@ -8,6 +8,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/CompileJavaModules.gmk b/closed/make/CompileJavaModules.gmk
index db7f468599e..e8731131a05 100644
--- a/closed/make/CompileJavaModules.gmk
+++ b/closed/make/CompileJavaModules.gmk
@@ -6,6 +6,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/DDR-gensrc.gmk b/closed/make/DDR-gensrc.gmk
index 7c4e393dad7..65af88b0e8e 100644
--- a/closed/make/DDR-gensrc.gmk
+++ b/closed/make/DDR-gensrc.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/DDR-jar.gmk b/closed/make/DDR-jar.gmk
index d5535b8a06d..bfefdb5dda1 100644
--- a/closed/make/DDR-jar.gmk
+++ b/closed/make/DDR-jar.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/Docs.gmk b/closed/make/Docs.gmk
index a70567bea9d..2efd1e5faac 100644
--- a/closed/make/Docs.gmk
+++ b/closed/make/Docs.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
index f42ec6a5155..46ec20c470c 100644
--- a/closed/make/Main.gmk
+++ b/closed/make/Main.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/ReleaseFile.gmk b/closed/make/ReleaseFile.gmk
index d6be94c5158..c79ef6f3286 100644
--- a/closed/make/ReleaseFile.gmk
+++ b/closed/make/ReleaseFile.gmk
@@ -1,21 +1,24 @@
-# ===========================================================================
-# (c) Copyright IBM Corp. 2017 All Rights Reserved
-# ===========================================================================
-# 
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
-# 
-# ===========================================================================
+# ===========================================================================
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
+# ===========================================================================
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  
+#
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
+# 
+# ===========================================================================
 
 COMPANY_NAME := Eclipse OpenJ9
 OPENJ9OMR_SHA := $(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
diff --git a/closed/make/closed_make/copy/Copy-jdk.jfr.gmk b/closed/make/closed_make/copy/Copy-jdk.jfr.gmk
index c3625906454..0bec2eeccd1 100644
--- a/closed/make/closed_make/copy/Copy-jdk.jfr.gmk
+++ b/closed/make/closed_make/copy/Copy-jdk.jfr.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/closed_make/launcher/Launcher-openj9.dtfj.gmk b/closed/make/closed_make/launcher/Launcher-openj9.dtfj.gmk
index 91dabf32c26..9a40323fb60 100644
--- a/closed/make/closed_make/launcher/Launcher-openj9.dtfj.gmk
+++ b/closed/make/closed_make/launcher/Launcher-openj9.dtfj.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 # ===========================================================================
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/closed_make/launcher/Launcher-openj9.dtfjview.gmk b/closed/make/closed_make/launcher/Launcher-openj9.dtfjview.gmk
index 5737fe03e91..c736675bc43 100644
--- a/closed/make/closed_make/launcher/Launcher-openj9.dtfjview.gmk
+++ b/closed/make/closed_make/launcher/Launcher-openj9.dtfjview.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 # ===========================================================================
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/closed_make/launcher/Launcher-openj9.traceformat.gmk b/closed/make/closed_make/launcher/Launcher-openj9.traceformat.gmk
index 0ccfd8e2f56..329f351f176 100644
--- a/closed/make/closed_make/launcher/Launcher-openj9.traceformat.gmk
+++ b/closed/make/closed_make/launcher/Launcher-openj9.traceformat.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 # ===========================================================================
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/common/JdkNativeCompilation.gmk b/closed/make/common/JdkNativeCompilation.gmk
index 1f34288bdae..389fc7df60a 100644
--- a/closed/make/common/JdkNativeCompilation.gmk
+++ b/closed/make/common/JdkNativeCompilation.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
diff --git a/closed/make/common/Modules.gmk b/closed/make/common/Modules.gmk
index ec69ba67710..0ebd004448d 100644
--- a/closed/make/common/Modules.gmk
+++ b/closed/make/common/Modules.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/common/SetupJavaCompilers.gmk b/closed/make/common/SetupJavaCompilers.gmk
index 6ed4064cd05..549985cfa9f 100644
--- a/closed/make/common/SetupJavaCompilers.gmk
+++ b/closed/make/common/SetupJavaCompilers.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/copy/Copy-java.base.gmk b/closed/make/copy/Copy-java.base.gmk
index cf2ec215062..cc5e3069deb 100644
--- a/closed/make/copy/Copy-java.base.gmk
+++ b/closed/make/copy/Copy-java.base.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/gensrc/GensrcVarHandles-post.gmk b/closed/make/gensrc/GensrcVarHandles-post.gmk
index d1d9acac844..622771cd723 100644
--- a/closed/make/gensrc/GensrcVarHandles-post.gmk
+++ b/closed/make/gensrc/GensrcVarHandles-post.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/launcher/Launcher-jdk.jcmd-post.gmk b/closed/make/launcher/Launcher-jdk.jcmd-post.gmk
index 9cc8b5f4c62..35f2e040aac 100644
--- a/closed/make/launcher/Launcher-jdk.jcmd-post.gmk
+++ b/closed/make/launcher/Launcher-jdk.jcmd-post.gmk
@@ -5,6 +5,9 @@
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/launcher/Launcher-jdk.jstatd-post.gmk b/closed/make/launcher/Launcher-jdk.jstatd-post.gmk
index b54726536f9..6867efc8b52 100644
--- a/closed/make/launcher/Launcher-jdk.jstatd-post.gmk
+++ b/closed/make/launcher/Launcher-jdk.jstatd-post.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/lib/Lib-java.management-post.gmk b/closed/make/lib/Lib-java.management-post.gmk
index da1481cb1c0..4fc84cb4ecf 100644
--- a/closed/make/lib/Lib-java.management-post.gmk
+++ b/closed/make/lib/Lib-java.management-post.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/make/lib/Lib-jdk.management-post.gmk b/closed/make/lib/Lib-jdk.management-post.gmk
index 00b8aa84641..df6e47e6587 100644
--- a/closed/make/lib/Lib-jdk.management-post.gmk
+++ b/closed/make/lib/Lib-jdk.management-post.gmk
@@ -1,11 +1,14 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/openj9_version_info.h.in b/closed/openj9_version_info.h.in
index a4fce33217b..a4dfe2bcb2d 100644
--- a/closed/openj9_version_info.h.in
+++ b/closed/openj9_version_info.h.in
@@ -7,6 +7,9 @@
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/conf/jvm.cfg b/closed/src/java.base/conf/jvm.cfg
index 2d3b02aba0c..63d1bbaf734 100644
--- a/closed/src/java.base/conf/jvm.cfg
+++ b/closed/src/java.base/conf/jvm.cfg
@@ -1,10 +1,11 @@
-# ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
-# ===========================================================================
-# 
+# Copyright (c) 2003, 2013, 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
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +14,15 @@
 # accompanied this code).
 #
 # You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
-# 
-# ===========================================================================
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
+#
 -j9vm KNOWN
 -server IGNORE
 -client IGNORE
diff --git a/closed/src/java.base/share/classes/java/io/ClassCache.java b/closed/src/java.base/share/classes/java/io/ClassCache.java
index 7543e9a6db9..9fb88441aaf 100644
--- a/closed/src/java.base/share/classes/java/io/ClassCache.java
+++ b/closed/src/java.base/share/classes/java/io/ClassCache.java
@@ -1,12 +1,15 @@
 /*
 * ===========================================================================
-* (c) Copyright IBM Corp. 2017 All Rights Reserved
+* (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/AccessController.c b/closed/src/java.base/share/native/libjava/AccessController.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/AccessController.c
+++ b/closed/src/java.base/share/native/libjava/AccessController.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/Class.c b/closed/src/java.base/share/native/libjava/Class.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/Class.c
+++ b/closed/src/java.base/share/native/libjava/Class.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/ClassLoader.c b/closed/src/java.base/share/native/libjava/ClassLoader.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/ClassLoader.c
+++ b/closed/src/java.base/share/native/libjava/ClassLoader.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/ClassLoader.h b/closed/src/java.base/share/native/libjava/ClassLoader.h
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/ClassLoader.h
+++ b/closed/src/java.base/share/native/libjava/ClassLoader.h
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/Object.c b/closed/src/java.base/share/native/libjava/Object.c
index dae90ff6ac5..19ccce836f8 100644
--- a/closed/src/java.base/share/native/libjava/Object.c
+++ b/closed/src/java.base/share/native/libjava/Object.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
   * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/StackStreamFactory.c b/closed/src/java.base/share/native/libjava/StackStreamFactory.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/StackStreamFactory.c
+++ b/closed/src/java.base/share/native/libjava/StackStreamFactory.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/StackTraceElement.c b/closed/src/java.base/share/native/libjava/StackTraceElement.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/StackTraceElement.c
+++ b/closed/src/java.base/share/native/libjava/StackTraceElement.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/System.c b/closed/src/java.base/share/native/libjava/System.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/System.c
+++ b/closed/src/java.base/share/native/libjava/System.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/Thread.c b/closed/src/java.base/share/native/libjava/Thread.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/Thread.c
+++ b/closed/src/java.base/share/native/libjava/Thread.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/Throwable.c b/closed/src/java.base/share/native/libjava/Throwable.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/Throwable.c
+++ b/closed/src/java.base/share/native/libjava/Throwable.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.base/share/native/libjava/verify_stub.c b/closed/src/java.base/share/native/libjava/verify_stub.c
index b17c2a675a4..1c69d367c9c 100644
--- a/closed/src/java.base/share/native/libjava/verify_stub.c
+++ b/closed/src/java.base/share/native/libjava/verify_stub.c
@@ -1,12 +1,15 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
  * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/java.rmi/share/classes/module-info.java.extra b/closed/src/java.rmi/share/classes/module-info.java.extra
index 14707a065c0..bdaeab3dd19 100644
--- a/closed/src/java.rmi/share/classes/module-info.java.extra
+++ b/closed/src/java.rmi/share/classes/module-info.java.extra
@@ -8,6 +8,9 @@
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/src/jdk.internal.vm.ci/share/classes/module-info.java b/closed/src/jdk.internal.vm.ci/share/classes/module-info.java
index 716c5605f65..f2d67ee8c4a 100644
--- a/closed/src/jdk.internal.vm.ci/share/classes/module-info.java
+++ b/closed/src/jdk.internal.vm.ci/share/classes/module-info.java
@@ -1,12 +1,15 @@
 /*
 * ===========================================================================
-* (c) Copyright IBM Corp. 2018 All Rights Reserved
+* (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
 * ===========================================================================
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  
  *
+ * IBM designates this particular file as subject to the "Classpath" exception 
+ * as provided by IBM in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/closed/variant-server/gensrc/jvmtifiles/jvmti.html b/closed/variant-server/gensrc/jvmtifiles/jvmti.html
index f92f25d4b8b..44b771078ee 100644
--- a/closed/variant-server/gensrc/jvmtifiles/jvmti.html
+++ b/closed/variant-server/gensrc/jvmtifiles/jvmti.html
@@ -8,6 +8,9 @@
      under the terms of the GNU General Public License version 2 only, as
      published by the Free Software Foundation.
 
+     IBM designates this particular file as subject to the "Classpath" exception 
+     as provided by IBM in the LICENSE file that accompanied this code.
+
      This code is distributed in the hope that it will be useful, but WITHOUT
      ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
      FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/configure b/configure
index 70f1950cca1..a5cdd2c0442 100644
--- a/configure
+++ b/configure
@@ -1,7 +1,5 @@
 #!/bin/bash
 #
-# (c) Copyright IBM Corp. 2017,2018 All Rights Reserved
-#
 # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -23,7 +21,10 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-
+# ===========================================================================
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+# ===========================================================================
+# 
 # This is a thin wrapper which will call the real configure script, and
 # make sure that is called using bash.
 
diff --git a/get_source.sh b/get_source.sh
index d84bd7178bd..f6992058910 100644
--- a/get_source.sh
+++ b/get_source.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
-
-#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# ===========================================================================
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
+# ===========================================================================
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
+# published by the Free Software Foundation.
+#
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,12 +17,9 @@
 # accompanied this code).
 #
 # You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
 #
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
+# ===========================================================================
 #
 
 # exit immediately if any unexpected error occurs
diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 31cd884745c..d15af894569 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -1,11 +1,5 @@
 /*
- * ===========================================================================
- * (c) Copyright IBM Corp. 1997, 2018 All Rights Reserved
- * ===========================================================================
- */
-
-/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -28,7 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 package java.net;
 
 import java.io.Closeable;
diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index c205d85f3ea..6b93b80a2dd 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -1,9 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2000, 2018 All Rights Reserved
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 
 #warn This file is preprocessed before being compiled
 
diff --git a/src/java.base/share/classes/java/util/Arrays.java b/src/java.base/share/classes/java/util/Arrays.java
index 247c1415358..adb41e3e8f7 100644
--- a/src/java.base/share/classes/java/util/Arrays.java
+++ b/src/java.base/share/classes/java/util/Arrays.java
@@ -1,8 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved.
- * ===========================================================================
- */
 /*
  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved.
+ * ===========================================================================
+ */
 
 package java.util;
 
diff --git a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
index bf121b9fe12..c190691c8f2 100644
--- a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
@@ -1,24 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2012, 2018 All Rights Reserved
- * ===========================================================================
- * 
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
- * 
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 package java.util.stream;
 
 import java.util.Objects;
diff --git a/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java
index 42b559d60b8..a7f26a3499c 100644
--- a/src/java.base/share/classes/java/util/stream/IntPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/IntPipeline.java
@@ -1,24 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2012, 2018 All Rights Reserved
- * ===========================================================================
- * 
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
- * 
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,6 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ * 
+ */
 package java.util.stream;
 
 import java.util.IntSummaryStatistics;
diff --git a/src/java.base/share/classes/java/util/stream/Streams.java b/src/java.base/share/classes/java/util/stream/Streams.java
index fd2d26d04f2..9b3b26358a5 100644
--- a/src/java.base/share/classes/java/util/stream/Streams.java
+++ b/src/java.base/share/classes/java/util/stream/Streams.java
@@ -1,24 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2012, 2018 All Rights Reserved
- * ===========================================================================
- * 
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
- * 
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 package java.util.stream;
 
 import java.util.Comparator;
diff --git a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
index f27929578da..9bab033f19d 100644
--- a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
+++ b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
diff --git a/src/java.base/share/classes/jdk/internal/loader/Resource.java b/src/java.base/share/classes/jdk/internal/loader/Resource.java
index fb205d2a6c7..362615671dc 100644
--- a/src/java.base/share/classes/jdk/internal/loader/Resource.java
+++ b/src/java.base/share/classes/jdk/internal/loader/Resource.java
@@ -1,9 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 1998, 2017 All Rights Reserved
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 
 package jdk.internal.loader;
 
diff --git a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
index 424d14bf88c..04566cc8000 100644
--- a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
+++ b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 52110091bb5..748e61c7717 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -1,10 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2014, 2018 All Rights Reserved
- * ===========================================================================
- */
-
-/*
  * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +21,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 
 package jdk.internal.module;
 
diff --git a/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat b/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat
index 194dd97fc62..e978191a849 100644
--- a/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat
+++ b/src/java.base/share/classes/jdk/internal/module/jdk8_packages.dat
@@ -1,9 +1,3 @@
-#
-# ===========================================================================
-# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
-# ===========================================================================
-#
-
 # Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -27,6 +21,10 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
+# ===========================================================================
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+# ===========================================================================
+#
 apple.applescript
 apple.laf
 apple.launcher
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index 492b41b54f9..d68f52c0e50 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
@@ -1,10 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2000, 2017 All Rights Reserved
- * ===========================================================================
- */
-
-/*
  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +22,11 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 package sun.nio.cs;
 
 import java.nio.ByteBuffer;
diff --git a/src/java.base/share/native/libfdlibm/k_rem_pio2.c b/src/java.base/share/native/libfdlibm/k_rem_pio2.c
index 9a1bf1ff35d..f98da8a7d24 100644
--- a/src/java.base/share/native/libfdlibm/k_rem_pio2.c
+++ b/src/java.base/share/native/libfdlibm/k_rem_pio2.c
@@ -22,7 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 /*
  * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
  * double x[],y[]; int e0,nx,prec; int ipio2[];
diff --git a/src/java.base/share/native/libjimage/NativeImageBuffer.cpp b/src/java.base/share/native/libjimage/NativeImageBuffer.cpp
index 5384451cdca..21bfde37267 100644
--- a/src/java.base/share/native/libjimage/NativeImageBuffer.cpp
+++ b/src/java.base/share/native/libjimage/NativeImageBuffer.cpp
@@ -1,8 +1,4 @@
 /*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
- * ===========================================================================
- *
  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +28,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 #include <string.h>
 
 #include "jni.h"
diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
index 8d16d4507be..9de37a16805 100644
--- a/src/java.base/unix/native/include/jni_md.h
+++ b/src/java.base/unix/native/include/jni_md.h
@@ -1,8 +1,4 @@
 /*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
- * ===========================================================================
- *
  * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,7 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
+ 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
+ 
 #ifndef _JAVASOFT_JNI_MD_H_
 #define _JAVASOFT_JNI_MD_H_
 
diff --git a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
index 1e3a7ecfd03..9608b091597 100644
--- a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
+++ b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
@@ -1,10 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 1996, 2017 All Rights Reserved
- * ===========================================================================
- */
-
-/*
  * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +21,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 
 package sun.rmi.server;
 
diff --git a/src/jdk.attach/share/classes/module-info.java b/src/jdk.attach/share/classes/module-info.java
index a433bc1228c..e429bf7437d 100644
--- a/src/jdk.attach/share/classes/module-info.java
+++ b/src/jdk.attach/share/classes/module-info.java
@@ -1,10 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2014, 2018 All Rights Reserved
- * ===========================================================================
- */
-
-/*
  * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +21,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ * ===========================================================================
+ */
 
 /**
  * Defines the attach API.
diff --git a/src/jdk.management/share/classes/module-info.java b/src/jdk.management/share/classes/module-info.java
index a77f13c07c8..e52e604f65b 100644
--- a/src/jdk.management/share/classes/module-info.java
+++ b/src/jdk.management/share/classes/module-info.java
@@ -1,10 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2015, 2018 All Rights Reserved
- * ===========================================================================
- */
-
-/*
  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +22,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2015, 2018 All Rights Reserved
+ * ===========================================================================
+ */
+
 /**
  * Defines JDK-specific management interfaces for the JVM.
  *
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 1dadcbc5f45..78702aa7411 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -1,10 +1,13 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+# Portions Copyright 2018, 2018 IBM Corporation.
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 #
+# IBM designates this particular file as subject to the "Classpath" exception 
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
@@ -15,7 +18,6 @@
 # 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
 # ===========================================================================
 
-
 # This file identifies the root of the test-suite hierarchy.
 # It also contains test-suite configuration information.