Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 6179)
+++ wp-admin/setup-config.php	(working copy)
@@ -160,7 +160,11 @@
 	define('DB_HOST', $dbhost);
 
 	// We'll fail here if the values are no good.
-	require_once('../wp-includes/wp-db.php');
+	if ( file_exists(ABSPATH . 'wp-content/db.php') )
+		require_once (ABSPATH . 'wp-content/db.php');
+	else
+		require_once (ABSPATH . WPINC . '/wp-db.php');
+		
 	$handle = fopen('../wp-config.php', 'w');
 
 	foreach ($configFile as $line_num => $line) {