diff --git a/wp-feed.php b/wp-feed.php
index 78daa6d22..24cd8d672 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Redirects to the RSS2 feed
+ * Redirects to the default feed
  * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
 require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
+wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index b4c8fcfe4..7d7da1bc8 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -190,7 +190,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/';
-				$addl_path .= user_trailingslashit( 'feed/' . ( ( 'rss2' ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+				$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
 				$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
 			}