diff --git a/wp-admin/update-links.php b/wp-admin/update-links.php
index 2482debc6c..6641279815 100644
--- a/wp-admin/update-links.php
+++ b/wp-admin/update-links.php
@@ -1,5 +1,5 @@
 <?php
-require_once( dirname( dirname(__FILE__) ) . '/wp-config.php');
+require_once('../wp-config.php');
 require_once( ABSPATH . 'wp-includes/class-snoopy.php');
 
 if ( !get_option('use_linksupdate') )
diff --git a/wp-app.php b/wp-app.php
index 57804aa24b..b0896f49a8 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -9,8 +9,8 @@
 
 define('APP_REQUEST', true);
 
-require_once('wp-config.php');
-require_once('wp-includes/post-template.php');
+require_once('./wp-config.php');
+require_once(ABSPATH . WPINC . '/post-template.php');
 
 // Attempt to automatically detect whether to use querystring
 // or PATH_INFO, based on our environment:
diff --git a/wp-atom.php b/wp-atom.php
index 60f2155414..4c52b97f01 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('feed=atom');
 }
 
diff --git a/wp-commentsrss2.php b/wp-commentsrss2.php
index 531f6268be..5c3f169f6a 100644
--- a/wp-commentsrss2.php
+++ b/wp-commentsrss2.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('feed=rss2&withcomments=1');
 }
 
diff --git a/wp-cron.php b/wp-cron.php
index eb303f8a14..f60ac56e46 100644
--- a/wp-cron.php
+++ b/wp-cron.php
@@ -1,7 +1,7 @@
 <?php
 ignore_user_abort(true);
 define('DOING_CRON', TRUE);
-require_once('wp-config.php');
+require_once('./wp-config.php');
 
 if ( $_GET['check'] != wp_hash('187425') )
 	exit;
diff --git a/wp-rdf.php b/wp-rdf.php
index 293032b442..e18b54d274 100644
--- a/wp-rdf.php
+++ b/wp-rdf.php
@@ -1,7 +1,7 @@
 <?php /* RDF 1.0 generator, original version by garym@teledyn.com */
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('feed=rdf');
 }
 
diff --git a/wp-rss.php b/wp-rss.php
index 9df542773f..6f08ee8dc6 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('feed=rss');
 }
 
diff --git a/wp-rss2.php b/wp-rss2.php
index 6467ab8e93..54531d3240 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('feed=rss2');
 }
 
diff --git a/wp-trackback.php b/wp-trackback.php
index c128476dd4..4d82f9fc9c 100644
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($wp)) {
-	require_once('wp-config.php');
+	require_once('./wp-config.php');
 	wp('tb=1');
 }