diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index c984e5096..4e746ff72 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -793,12 +793,12 @@ class WP_Rewrite {
 		$robots_rewrite = array('robots.txt$' => $this->index . '?robots=1');
 
 		//Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category%
-		$default_feeds = array(	'wp-atom.php$'	=>	$this->index .'?feed=atom',
-								'wp-rdf.php$'	=>	$this->index .'?feed=rdf',
-								'wp-rss.php$'	=>	$this->index .'?feed=rss',
-								'wp-rss2.php$'	=>	$this->index .'?feed=rss2',
-								'wp-feed.php$'	=>	$this->index .'?feed=feed',
-								'wp-commentsrss2.php$'	=>	$this->index . '?feed=rss2&withcomments=1');
+		$default_feeds = array(	'.*/wp-atom.php$'	=>	$this->index .'?feed=atom',
+								'.*/wp-rdf.php$'	=>	$this->index .'?feed=rdf',
+								'.*/wp-rss.php$'	=>	$this->index .'?feed=rss',
+								'.*/wp-rss2.php$'	=>	$this->index .'?feed=rss2',
+								'.*/wp-feed.php$'	=>	$this->index .'?feed=feed',
+								'.*/wp-commentsrss2.php$'	=>	$this->index . '?feed=rss2&withcomments=1');
 
 		// Post
 		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index fc5900682..b35709eb3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,6 +16,6 @@ $wp_version = '2.6-bleeding';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 7558;
+$wp_db_version = 7574;
 
 ?>