diff -r d75c4a1f136a -r 501bf3acd898 jdk/make/templates/gpl-cp-header
--- a/jdk/make/templates/gpl-cp-header	Fri Dec 03 21:37:05 2010 -0800
+++ b/jdk/make/templates/gpl-cp-header	Mon Dec 06 10:47:40 2010 -0800
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) %YEARS% 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
@@ -20,3 +20,4 @@
 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.
+