diff --git a/b2comments.post.php b/b2comments.post.php
index 23f1ddc011..140fc4c9d9 100644
--- a/b2comments.post.php
+++ b/b2comments.post.php
@@ -3,8 +3,8 @@
 # if you want to change the paths here, remember to put your new path BEFORE $b2inc,
 #  like this: "b2/$b2inc/b2functions.php"
 
-require('b2config.php');
-require($abspath.$b2inc.'/b2template.functions.php');
+require_once('wp-config.php');
+require_once($abspath.$b2inc.'/b2template.functions.php');
 include($abspath.$b2inc.'/b2vars.php');
 include($abspath.$b2inc.'/b2functions.php');
 
diff --git a/b2login.php b/b2login.php
index b3814d30b0..50be3448ff 100644
--- a/b2login.php
+++ b/b2login.php
@@ -1,5 +1,5 @@
 <?php
-require('b2config.php');
+require_once('wp-config.php');
 require_once($abspath.$b2inc.'/b2template.functions.php');
 require_once($abspath.$b2inc.'/b2functions.php');
 require_once($abspath.$b2inc.'/b2vars.php');
diff --git a/b2mail.php b/b2mail.php
index 47a85ee280..ff652a5d29 100644
--- a/b2mail.php
+++ b/b2mail.php
@@ -3,13 +3,13 @@
 # pop3-2-b2 mail to blog
 # v0.3 20020716
 
-require('b2config.php');
-require($abspath.$b2inc."/b2template.functions.php");
-require($abspath.$b2inc.'/b2vars.php');
-require($abspath.$b2inc.'/class.POP3.php');
-require($abspath.$b2inc.'/b2functions.php');
-require($abspath.$b2inc."/xmlrpc.inc");
-require($abspath.$b2inc."/xmlrpcs.inc");
+require_once('wp-config.php');
+require_once($abspath.$b2inc."/b2template.functions.php");
+require_once($abspath.$b2inc.'/b2vars.php');
+require_once($abspath.$b2inc.'/class.POP3.php');
+require_once($abspath.$b2inc.'/b2functions.php');
+require_once($abspath.$b2inc."/xmlrpc.inc");
+require_once($abspath.$b2inc."/xmlrpcs.inc");
 
 dbconnect();
 timer_start();
diff --git a/b2register.php b/b2register.php
index 9511cec3d6..3341b2c22c 100644
--- a/b2register.php
+++ b/b2register.php
@@ -1,8 +1,8 @@
 <?php
 /* <Register> */
 
-require('b2config.php');
-require($abspath.$b2inc.'/b2functions.php');
+require_once('wp-config.php');
+require_once($abspath.$b2inc.'/b2functions.php');
 
 function add_magic_quotes($array) {
 	foreach ($array as $k => $v) {
diff --git a/b2trackback.php b/b2trackback.php
index fd1f259e24..84c9e588e1 100644
--- a/b2trackback.php
+++ b/b2trackback.php
@@ -57,7 +57,7 @@ if ((strlen(''.$tb_id)) && (empty($HTTP_GET_VARS['__mode'])) && (strlen(''.$tb_u
 	@header('Content-Type: text/xml');
 
 
-	require_once('b2config.php');
+	require_once('wp-config.php');
 	require_once($abspath.$b2inc.'/b2template.functions.php');
 	require_once($abspath.$b2inc.'/b2vars.php');
 	require_once($abspath.$b2inc.'/b2functions.php');
diff --git a/blog.header.php b/blog.header.php
index 3cf7ffcd45..6dc9d249a4 100644
--- a/blog.header.php
+++ b/blog.header.php
@@ -6,7 +6,7 @@ $use_gzipcompression = 1;
 /* Including config and functions files */
 $curpath = dirname(__FILE__).'/';
 
-require_once ($curpath.'/b2config.php');
+require_once ($curpath.'/wp-config.php');
 require_once ($curpath.$b2inc.'/b2template.functions.php');
 require_once ($curpath.$b2inc.'/b2vars.php');
 require_once ($curpath.$b2inc.'/b2functions.php');
diff --git a/blogger-2-wp.php b/blogger-2-wp.php
index e5e151b90d..fd00b41b25 100644
--- a/blogger-2-wp.php
+++ b/blogger-2-wp.php
@@ -20,7 +20,7 @@ switch ($action) {
 
 case "step1":
 
-	require('b2config.php');
+	require('wp-config.php');
 	require($abspath.$b2inc.'/b2template.functions.php');
 	require($abspath.$b2inc.'/b2functions.php');
 	require($abspath.$b2inc.'/b2vars.php');
diff --git a/gm-2-b2.php b/gm-2-b2.php
index de2d31e411..714597f2f6 100644
--- a/gm-2-b2.php
+++ b/gm-2-b2.php
@@ -4,8 +4,8 @@
 // 2. upload on your server in the directory where your b2 files are
 // 3. load in the browser from there
 
-require('b2config.php');
-require($abspath.$b2inc.'/b2functions.php');
+require_once('wp-config.php');
+require_once($abspath.$b2inc.'/b2functions.php');
 
 $b2varstoreset = array('action', 'gmpath', 'archivespath');
 for ($i=0; $i<count($b2varstoreset); $i += 1) {
diff --git a/wp-admin/b2-2-wp.php b/wp-admin/b2-2-wp.php
index 0add1e6ecf..b2ec81ee67 100644
--- a/wp-admin/b2-2-wp.php
+++ b/wp-admin/b2-2-wp.php
@@ -1,5 +1,5 @@
 <?php
-require('../b2config.php');
+require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
 if (!$step) $step = 0;
@@ -50,9 +50,8 @@ switch($step) {
   <li>The templates are so much better, and there is so much more going on than 
     before it's probably worth it to start from scratch and work back to your 
     design.</li>
-  <li>You can keeep your <code>b2config.php</code> file if you want to, but it 
-    is <strong>very important</strong> that you take the last few lines from the 
-    WordPress one and add those in, otherwise, nothing will work.</li>
+  <li>You need to transfer some of your settings from your old <code>b2config.php</code>
+    to <code>wp-config.php</code> file [NEED MORE INFO].</li>
   <li>WordPress issues should be discussed in our <a href="http://wordpress.org/support/">support 
     forums</a>.</li>
   <li><strong>Back up</strong> your database before you do anything. Yes, you. 
diff --git a/wp-admin/b2bookmarklet.php b/wp-admin/b2bookmarklet.php
index c74d8d36f2..58590faf57 100644
--- a/wp-admin/b2bookmarklet.php
+++ b/wp-admin/b2bookmarklet.php
@@ -8,7 +8,7 @@ function selected($selected, $current) {
 $mode = 'bookmarklet';
 
 $standalone = 1;
-require('b2header.php');
+require_once('b2header.php');
 
 if ($user_level == 0)
 	die ("Cheatin' uh?");
diff --git a/wp-admin/b2edit.showposts.php b/wp-admin/b2edit.showposts.php
index b28f855b1b..5060707e14 100644
--- a/wp-admin/b2edit.showposts.php
+++ b/wp-admin/b2edit.showposts.php
@@ -1,7 +1,7 @@
 <div class="wrap">
 <?php
 
-require_once('../b2config.php');
+require_once('../wp-config.php');
 
 if (!$showposts) {
 	if ($posts_per_page) {
diff --git a/wp-admin/b2header.php b/wp-admin/b2header.php
index da9b7d7389..30ae01b9e1 100644
--- a/wp-admin/b2header.php
+++ b/wp-admin/b2header.php
@@ -1,6 +1,6 @@
 <?php
 
-require('../b2config.php');
+require_once('../wp-config.php');
 require_once($abspath.$b2inc.'/b2template.functions.php');
 require_once($abspath.'/wp-admin/b2verifauth.php');
 require_once($abspath.$b2inc.'/b2vars.php');
@@ -95,4 +95,4 @@ if ($profile==0) {
 
 <?php
 }
-?>
+?>
\ No newline at end of file
diff --git a/wp-admin/b2template.php b/wp-admin/b2template.php
index 9e962793f3..6050e68e81 100644
--- a/wp-admin/b2template.php
+++ b/wp-admin/b2template.php
@@ -40,7 +40,7 @@ switch($action) {
 case 'update':
 
 	$standalone = 1;
-	require("b2header.php");
+	require_once("b2header.php");
 
 	if ($user_level < 3) {
 		die('<p>You have no right to edit the template for this blog.<br />Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
@@ -60,7 +60,7 @@ break;
 
 default:
 
-	require('b2header.php');
+	require_once('b2header.php');
 
 	if ($user_level <= 3) {
 		die('<p>You have no right to edit the template for this blog.<br>Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
diff --git a/wp-admin/linkmanager.php b/wp-admin/linkmanager.php
index 3a2b5bedba..d25891c73a 100644
--- a/wp-admin/linkmanager.php
+++ b/wp-admin/linkmanager.php
@@ -26,7 +26,7 @@
 //
 // Mike Little (mike@zed1.com)
 // *****************************************************************
-include_once('../b2config.php');
+include_once('../wp-config.php');
 include_once('../wp-links/links.config.php');
 include_once("../wp-links/links.php");
 
diff --git a/wp-admin/links.import.php b/wp-admin/links.import.php
index 438c1ce0b6..edb8b7e714 100644
--- a/wp-admin/links.import.php
+++ b/wp-admin/links.import.php
@@ -26,7 +26,7 @@
 //
 // Mike Little (mike@zed1.com)
 // *****************************************************************
-require('../b2config.php');
+require_once('../wp-config.php');
 include_once('../wp-links/links.config.php');
 include_once("../wp-links/links.php");
 
diff --git a/wp-admin/upgrade-070-to-071.php b/wp-admin/upgrade-070-to-071.php
index c2e339b54f..9c84b02098 100644
--- a/wp-admin/upgrade-070-to-071.php
+++ b/wp-admin/upgrade-070-to-071.php
@@ -1,5 +1,5 @@
 <?php
-require('../b2config.php');
+require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
 if (!$step) $step = 0;