--- a/usr/src/cmd/prtconf/prtconf.c	Fri Aug 06 13:53:14 2010 -0600
+++ b/usr/src/cmd/prtconf/prtconf.c	Fri Aug 06 14:04:46 2010 -0700
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -343,17 +342,11 @@
 	/*
 	 * If 0 bytes are returned (the system returns '1', for the \0),
 	 * we're probably on x86, and there has been no si-hw-provider
-	 * set in /etc/bootrc, so just default to Sun.
+	 * set in /etc/bootrc, default to Oracle.
 	 */
 	if (ret <= 1) {
-		(void) strncpy(hw_provider, "Sun Microsystems",
+		(void) strncpy(hw_provider, "Oracle Corporation",
 		    sizeof (hw_provider));
-	} else {
-		/*
-		 * Provide backward compatibility by stripping out the _.
-		 */
-		if (strcmp(hw_provider, "Sun_Microsystems") == 0)
-			hw_provider[3] = ' ';
 	}
 	(void) printf("System Configuration:  %s  %s\n", hw_provider,
 	    opts.o_uts.machine);

--- a/usr/src/uts/common/conf/param.c	Fri Aug 06 13:53:14 2010 -0600
+++ b/usr/src/uts/common/conf/param.c	Fri Aug 06 14:04:46 2010 -0700
@@ -525,11 +525,11 @@
 
 /*
  * On sparc machines, read hw_serial from the firmware at boot time
- * and simply assert Sun is the hardware provider.  Hmm.
+ * and simply assert Oracle is the hardware provider.
  */
 char architecture[] = "sparcv9";
 char architecture_32[] = "sparc";
-char hw_provider[] = "Sun_Microsystems";
+char hw_provider[] = "Oracle Corporation";
 
 #elif defined(__i386)