Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 17444)
+++ wp-admin/setup-config.php	(working copy)
@@ -217,7 +217,7 @@
 	foreach ($configFile as $line_num => $line) {
 		switch (substr($line,0,16)) {
 			case "define('DB_NAME'":
-				$configFile[$line_num] = str_replace("database_name_here", $dbname, $line);
+				$configFile[$line_num] = str_replace("database_name_here", "'$dbname'", $line);
 				break;
 			case "define('DB_USER'":
 				$configFile[$line_num] = str_replace("'username_here'", "'$uname'", $line);
@@ -226,7 +226,7 @@
 				$configFile[$line_num] = str_replace("'password_here'", "'$passwrd'", $line);
 				break;
 			case "define('DB_HOST'":
-				$configFile[$line_num] = str_replace("localhost", $dbhost, $line);
+				$configFile[$line_num] = str_replace("localhost", "'$dbhost'", $line);
 				break;
 			case '$table_prefix  =':
 				$configFile[$line_num] = str_replace('wp_', $prefix, $line);