Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947.2.24
diff -u -p -r1.947.2.24 node.module
--- modules/node/node.module	2 Jun 2010 12:11:07 -0000	1.947.2.24
+++ modules/node/node.module	14 Jun 2010 20:39:27 -0000
@@ -1665,7 +1665,10 @@ 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',
+  );
 
   $items = '';
   foreach ($nids as $nid) {
@@ -1741,9 +1744,18 @@ function node_feed($nids = FALSE, $chann
   );
   $channel = array_merge($channel_defaults, $channel);
 
+  $atom_link = array(
+    'key'        => 'atom:link',
+    'attributes' => array(
+      'href' => $base_url .'/'. $_GET['q'],
+      'rel'  => 'self',
+      'type' => 'application/rss+xml',
+    ),
+  );
+
   $output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
   $output .= "<rss version=\"". $channel["version"] ."\" xml:base=\"". $base_url ."\" ". drupal_attributes($namespaces) .">\n";
-  $output .= format_rss_channel($channel['title'], $channel['link'], $channel['description'], $items, $channel['language']);
+  $output .= format_rss_channel($channel['title'], $channel['link'], $channel['description'], $items, $channel['language'], array($atom_link));
   $output .= "</rss>\n";
 
   drupal_set_header('Content-Type: application/rss+xml; charset=utf-8');