--- a/make/templates/gpl-cp-header	Wed Jun 16 10:25:52 2010 -0700
+++ b/make/templates/gpl-cp-header	Wed Jun 16 16:53:14 2010 -0700
@@ -1,4 +1,4 @@ Copyright %YEARS% Sun Microsystems, Inc.
-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

--- a/make/templates/gpl-header	Wed Jun 16 10:25:52 2010 -0700
+++ b/make/templates/gpl-header	Wed Jun 16 16:53:14 2010 -0700
@@ -1,4 +1,4 @@ Copyright %YEARS% Sun Microsystems, Inc.
-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