diff --git a/wp-atom.php b/wp-atom.php
index e294ded7df..87e291d427 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -2,6 +2,7 @@
 
 if (empty($feed)) {
     $blog = 1;
+		$feed = 'atom';
     $doing_rss = 1;
     require('wp-blog-header.php');
 }
diff --git a/wp-blog-header.php b/wp-blog-header.php
index 1ad47b0f9b..562514d2b9 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -101,10 +101,6 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 	}
 }
 
-if ( '' != $feed )
-	$doing_rss = true;
-
-
 if ( is_trackback() )
 	$doing_trackback = true;
 
@@ -112,7 +108,7 @@ if ( is_trackback() )
 
 if ( is_404() ) {
 	header('HTTP/1.x 404 Not Found');
-} else if ( !isset($doing_rss) || !$doing_rss ) {
+} else if ( !is_feed() ) {
 	@header('X-Pingback: '. get_bloginfo('pingback_url'));
 } else {
 	// We're showing a feed, so WP is indeed the only thing that last changed
@@ -207,7 +203,7 @@ if ($pagenow == 'index.php') {
 		// If $wp_template_redirect is set to false, template redirection
 		// should be skipped for everything except feeds and trackbacks.
 		$wp_template_redirect = true;
-		if ( is_feed() ) {
+		if ( is_feed() && empty($doing_rss) ) {
 			include(ABSPATH . '/wp-feed.php');
 			exit;
 		} else if ( is_trackback() ) {
@@ -217,7 +213,7 @@ if ($pagenow == 'index.php') {
 	} elseif ( !isset($wp_template_redirect) ) {
 		$wp_template_redirect = true;
 		do_action('template_redirect');
-		if ( is_feed() ) {
+		if ( is_feed() && empty($doing_rss) ) {
 			include(ABSPATH . '/wp-feed.php');
 			exit;
 		} else if ( is_trackback() ) {
diff --git a/wp-commentsrss2.php b/wp-commentsrss2.php
index 8157f37c8e..61ea83f4a4 100644
--- a/wp-commentsrss2.php
+++ b/wp-commentsrss2.php
@@ -1,6 +1,8 @@
 <?php 
 if ( empty($feed) ) {
+	$feed = 'rss2';
 	$withcomments = 1;
+	$doing_rss = 1;
 	require('wp-blog-header.php');
 }
 
diff --git a/wp-feed.php b/wp-feed.php
index 8f7dfba258..881b1772d2 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -9,7 +9,6 @@ if (empty($doing_rss)) {
 $feed = preg_replace('/^_+/', '', $feed);
 
 if ($feed == '' || $feed == 'feed') {
-    // TODO:  Get default feed from options DB.
     $feed = 'rss2';
 }
 
diff --git a/wp-rdf.php b/wp-rdf.php
index 6233d0e75e..67392ed95d 100644
--- a/wp-rdf.php
+++ b/wp-rdf.php
@@ -2,6 +2,7 @@
 
 if (empty($feed)) {
     $blog = 1; // enter your blog's ID
+		$feed = 'rdf';
     $doing_rss = 1;
     require('wp-blog-header.php');
 }
diff --git a/wp-rss.php b/wp-rss.php
index bb87b8904b..223f419d81 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -2,6 +2,7 @@
 
 if (empty($feed)) {
     $blog = 1;
+		$feed = 'rss';
     $doing_rss = 1;
     require('wp-blog-header.php');
 }
diff --git a/wp-rss2.php b/wp-rss2.php
index aaf2f53cb9..ae83b9e7b1 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -2,6 +2,7 @@
 
 if (empty($feed)) {
 	$blog = 1;
+	$feed = 'rss2';
 	$doing_rss = 1;
 	require('wp-blog-header.php');
 }