diff --git a/wp-atom.php b/wp-atom.php
index 9e20eb68e..f7221f3fe 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -1,21 +1,12 @@
 <?php
 /**
- * Outputs the Atom feed XML format using the feed-atom.php file in wp-includes
- * folder. This file only sets the feed format and includes the feed-atom.php.
- *
- * This file is no longer used in WordPress and while it is not deprecated now.
- * This file will most likely be deprecated or removed in a later version.
- *
- * The link for the atom feed is /index.php?feed=atom with permalinks off.
+ * Redirects to the Atom feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($wp)) {
-	require_once('./wp-load.php');
-	wp('feed=atom');
-}
-
-require (ABSPATH . WPINC . '/feed-atom.php');
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'atom_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-commentsrss2.php b/wp-commentsrss2.php
index 9c3b230f6..1c146b147 100644
--- a/wp-commentsrss2.php
+++ b/wp-commentsrss2.php
@@ -1,23 +1,12 @@
 <?php
 /**
- * Outputs the RSS2 XML format comment feed using the feed-rss2.php file in
- * wp-includes folder. This file only sets the feed format and includes the
- * feed-rss2-comments.php.
- *
- * This file is no longer used in WordPress and while it is not deprecated now.
- * This file will most likely be deprecated or removed in a later version.
- *
- * The link for the rss2 comment feed is /index.php?feed=rss2&withcomments=1
- * with permalinks off.
+ * Redirects to the Comments RSS2 feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($wp)) {
-	require_once('./wp-load.php');
-	wp('feed=rss2&withcomments=1');
-}
-
-require (ABSPATH . WPINC . '/feed-rss2-comments.php');
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'comments_rss2_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-feed.php b/wp-feed.php
index d4f1a5bff..78daa6d22 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -1,24 +1,12 @@
 <?php
 /**
- * Outputs the RSS2 feed XML format. This file is a shortcut or compatibility
- * layer for easily finding the RSS feed for the site. It loads WordPress using
- * the wp-blog-header.php file and running do_feed() function.
- *
- * @see do_feed() Used to display the RSS2 feed
- *
- * This file is no longer used in WordPress and while it is not deprecated now.
- * This file will most likely be deprecated or removed in a later version.
- *
- * The link for the rss2 feed is /index.php?feed=rss2 with permalinks off.
+ * Redirects to the RSS2 feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($doing_rss)) {
-	$doing_rss = 1;
-	require(dirname(__FILE__) . '/wp-blog-header.php');
-}
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
 
-do_feed();
-
-?>
+?>
\ No newline at end of file
diff --git a/wp-rdf.php b/wp-rdf.php
index fac4a8da2..3c8f005ff 100644
--- a/wp-rdf.php
+++ b/wp-rdf.php
@@ -1,23 +1,12 @@
 <?php
 /**
- * Outputs the RDF feed using the feed-rdf.php
- * file in wp-includes folder.
- *
- * This file only sets the feed format and includes the
- * feed-rdf.php.
- *
- * This file is no longer used in WordPress and while it is
- * not deprecated now. This file will most likely be
- * deprecated or removed in a later version.
+ * Redirects to the RDF feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($wp)) {
-	require_once('./wp-load.php');
-	wp('feed=rdf');
-}
-
-require (ABSPATH . WPINC . '/feed-rdf.php');
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'rdf_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-rss.php b/wp-rss.php
index 705c1f5cc..0ae63a238 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -1,23 +1,12 @@
 <?php
 /**
- * Outputs the RSS feed RDF format using the feed-rss.php
- * file in wp-includes folder.
- *
- * This file only sets the feed format and includes the
- * feed-rss.php.
- *
- * This file is no longer used in WordPress and while it is
- * not deprecated now. This file will most likely be
- * deprecated or removed in a later version.
+ * Redirects to the RSS feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($wp)) {
-	require_once('./wp-load.php');
-	wp('feed=rss');
-}
-
-require (ABSPATH . WPINC . '/feed-rss.php');
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'rss_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-rss2.php b/wp-rss2.php
index ba84ce99f..78daa6d22 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -1,21 +1,12 @@
 <?php
 /**
- * Outputs the RSS2 feed XML format using the feed-rss2.php file in wp-includes
- * folder. This file only sets the feed format and includes the feed-rss2.php.
- *
- * This file is no longer used in WordPress and while it is not deprecated now.
- * This file will most likely be deprecated or removed in a later version.
- *
- * The link for the rss2 feed is /index.php?feed=rss2 with permalinks off.
+ * Redirects to the RSS2 feed
+ * This file is deprecated and only exists for backwards compatibility
  *
  * @package WordPress
  */
 
-if (empty($wp)) {
-	require_once('./wp-load.php');
-	wp('feed=rss2');
-}
-
-require (ABSPATH . WPINC . '/feed-rss2.php');
+require( './wp-load.php' );
+wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
 
 ?>
\ No newline at end of file