diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 38765a3f3f..f6283b40a1 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -700,6 +700,14 @@ class WP_Rewrite {
 		// robots.txt
 		$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');
+
 		// Post
 		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
 		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
@@ -734,7 +742,7 @@ class WP_Rewrite {
 		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
 		// Put them together.
-		$this->rules = array_merge($robots_rewrite, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+		$this->rules = array_merge($robots_rewrite, $default_feeds, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
 
 		do_action_ref_array('generate_rewrite_rules', array(&$this));
 		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
@@ -889,4 +897,4 @@ class WP_Rewrite {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3159732eda..4d8745c7de 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -3,6 +3,6 @@
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 
 $wp_version = '2.1-alpha3';
-$wp_db_version = 3846;
+$wp_db_version = 4350;
 
-?>
\ No newline at end of file
+?>