Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 6437)
+++ wp-includes/pluggable.php	(working copy)
@@ -699,18 +699,17 @@
 
 if ( !function_exists('wp_salt') ) :
 function wp_salt() {
+
+	if ( defined('SECRET_KEY') && '' != SECRET_KEY )
+		return SECRET_KEY;
+
 	$salt = get_option('secret');
 	if ( empty($salt) ) {
 		$salt = wp_generate_password();
 		update_option('secret', $salt);
 	}
 
-	if ( !defined('SECRET_KEY') || '' == SECRET_KEY )
-		$secret_key = DB_PASSWORD . DB_USER . DB_NAME . DB_HOST . ABSPATH;
-	else
-		$secret_key = SECRET_KEY;
-		
-	return $salt . $secret_key;
+	return $salt;
 }
 endif;
 
Index: wp-config-sample.php
===================================================================
--- wp-config-sample.php	(revision 6437)
+++ wp-config-sample.php	(working copy)
@@ -6,6 +6,10 @@
 define('DB_HOST', 'localhost');    // 99% chance you won't need to change this value
 define('DB_CHARSET', 'utf8');
 define('DB_COLLATE', '');
+
+// Change SECRET_KEY to a unique phrase.  You won't have to remember it later,
+// so make it long and complicated.  You can visit https://www.grc.com/passwords.htm
+// to get a phrase generated for you.
 define('SECRET_KEY', ''); // Change this to a unique phrase.
 
 // You can have multiple installations in one database if you give each a unique prefix