diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index b44c427b5..ea3bb7769 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -218,7 +218,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
 				if ( get_query_var( 'withcomments' ) )
 					$addl_path .= 'comments/';
-				if ( ( in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed') ) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
+				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
 					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
 				else
 					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
@@ -228,7 +228,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 					'wp-atom.php'         => 'atom',
 					'wp-commentsrss2.php' => 'comments_rss2',
 					'wp-feed.php'         => get_default_feed(),
-					'wp-rdf.php'          => 'rss2',
+					'wp-rdf.php'          => 'rdf',
 					'wp-rss.php'          => 'rss2',
 					'wp-rss2.php'         => 'rss2',
 				);
@@ -314,7 +314,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		$redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
 		// Redirect obsolete feeds
-		$redirect['query'] = preg_replace( '#(^|&)feed=(rss|rdf)(&|$)#', '$1feed=rss2$3', $redirect['query'] );
+		$redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$3', $redirect['query'] );
 
 		// Remove redundant leading ampersands
 		$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index d76ad769a..34d8652b2 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -64,7 +64,7 @@ function bloginfo_rss($show = '') {
  */
 function get_default_feed() {
 	$default_feed = apply_filters('default_feed', 'rss2');
-	return in_array( $default_feed, array( 'rss', 'rdf' ) ) ? 'rss2' : $default_feed;
+	return 'rss' == $default_feed ? 'rss2' : $default_feed;
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0e0616a8d..2bb889b3d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '3.3-beta3-19254';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 19061;
+$wp_db_version = 19364;
 
 /**
  * Holds the TinyMCE version