--- a/hotspot/make/templates/bsd-header	Thu May 27 12:42:44 2010 -0700
+++ b/hotspot/make/templates/bsd-header	Thu May 27 19:08:38 2010 -0700
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright %YEARS% Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -11,7 +11,7 @@
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
-  - Neither the name of Sun Microsystems nor the names of its
+  - Neither the name of Oracle nor the names of its
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.