Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1023
diff -u -p -r1.1023 node.module
--- modules/node/node.module	6 Feb 2009 16:25:08 -0000	1.1023
+++ modules/node/node.module	13 Feb 2009 03:53:36 -0000
@@ -1912,7 +1912,7 @@ function node_feed($nids = FALSE, $chann
   }
 
   $item_length = variable_get('feed_item_length', 'teaser');
-  $namespaces = array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/');
+  $namespaces = array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/', 'xmlns:atom' => 'http://www.w3.org/2005/Atom');
 
   // Load all nodes to be rendered.
   $nodes = node_load_multiple($nids);
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.865
diff -u -p -r1.865 common.inc
--- includes/common.inc	9 Feb 2009 03:29:53 -0000	1.865
+++ includes/common.inc	13 Feb 2009 03:53:37 -0000
@@ -1278,6 +1278,10 @@ function format_rss_channel($title, $lin
 
   $output = "<channel>\n";
   $output .= ' <title>' . check_plain($title) . "</title>\n";
+
+  $self_file = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI']  : 'rss.xml';
+  $output .='<atom:link href="' . $base_url . $self_file . "\" rel=\"self\" type=\"application/rss+xml\" />\n";
+
   $output .= ' <link>' . check_url($link) . "</link>\n";
 
   // The RSS 2.0 "spec" doesn't indicate HTML can be used in the description.