--- a/hotspot/LICENSE	Thu May 27 12:42:44 2010 -0700
+++ b/hotspot/LICENSE	Thu May 27 19:08:38 2010 -0700
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
+Certain source files distributed by Oracle and/or its affiliates, are subject to
 the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+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."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of