diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 13a61143c96703def9e8386e564077ef49f989f5..3f735183de6630e4b0d632928dbc4edc706e0161 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -25,6 +25,8 @@ Drupal x.x.x, xxxx-xx-xx (development version)
 - book module:
     * added Docbook-like XML export functionality.
     * added OPML export functionality.
+- syndication:
+    * made the aggregator module parse Atom feeds.
 - XML-RPC:
     * replaced the XML-RPC library by a better one.
 - performance:
diff --git a/modules/aggregator.module b/modules/aggregator.module
index de07712469c25687dcc25f3fac1559f482321c71..f1f3671364225aeaed9bda35681be964e35bf67e 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -275,16 +275,38 @@ function aggregator_remove($feed) {
  * Call-back function used by the XML parser.
  */
 function aggregator_element_start($parser, $name, $attributes) {
-  global $item, $element, $tag;
+  global $item, $element, $tag, $items, $channel;
 
   switch ($name) {
     case 'IMAGE':
     case 'TEXTINPUT':
+    case 'CONTENT':
+    case 'SUMMARY':
+    case 'TAGLINE':
+    case 'SUBTITLE':
+    case 'LOGO':
+    case 'INFO':
+    case 'ID':
       $element = $name;
       break;
+    case 'LINK':
+      if ($attributes['REL'] == 'alternate') {
+        if ($element == 'ITEM') {
+          $items[$item]['LINK'] = $attributes['HREF'];
+        }
+        else {
+          $channel['LINK'] = $attributes['HREF'];
+        }
+      }
+      break;
     case 'ITEM':
       $element = $name;
       $item += 1;
+      break;
+    case 'ENTRY':
+      $element = 'ITEM';
+      $item += 1;
+      break;
   }
 
   $tag = $name;
@@ -300,6 +322,10 @@ function aggregator_element_end($parser, $name) {
     case 'IMAGE':
     case 'TEXTINPUT':
     case 'ITEM':
+    case 'ENTRY':
+    case 'CONTENT':
+    case 'INFO':
+    case 'ID':
       $element = '';
   }
 }
@@ -315,8 +341,26 @@ function aggregator_element_data($parser, $data) {
       $items[$item][$tag] .= $data;
       break;
     case 'IMAGE':
+    case 'LOGO':
       $image[$tag] .= $data;
       break;
+    case 'LINK':
+      if ($data) {
+        $items[$item][$tag] .= $data;
+      }
+      break;
+    case 'CONTENT':
+      $items[$item]['DESCRIPTION'] .= $data;
+      break;
+    case 'SUMMARY':
+      $items[$item]['DESCRIPTION'] .= $data;
+      break;
+    case 'TAGLINE':
+    case 'SUBTITLE':
+      $channel['DESCRIPTION'] .= $data;
+      break;
+    case 'INFO':
+    case 'ID':
     case 'TEXTINPUT':
       // The sub-element is not supported. However, we must recognize
       // it or its contents will end up in the item array.
@@ -488,7 +532,6 @@ function aggregator_parse_feed(&$data, $feed) {
       $value = preg_replace('/\Won[a-z]+\s*=[^>]+?>/i', '>', $value);
       $item[$key] = $value;
     }
-
     /*
     ** Resolve the item's title.  If no title is found, we use
     ** up to 40 characters of the description ending at a word
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index de07712469c25687dcc25f3fac1559f482321c71..f1f3671364225aeaed9bda35681be964e35bf67e 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -275,16 +275,38 @@ function aggregator_remove($feed) {
  * Call-back function used by the XML parser.
  */
 function aggregator_element_start($parser, $name, $attributes) {
-  global $item, $element, $tag;
+  global $item, $element, $tag, $items, $channel;
 
   switch ($name) {
     case 'IMAGE':
     case 'TEXTINPUT':
+    case 'CONTENT':
+    case 'SUMMARY':
+    case 'TAGLINE':
+    case 'SUBTITLE':
+    case 'LOGO':
+    case 'INFO':
+    case 'ID':
       $element = $name;
       break;
+    case 'LINK':
+      if ($attributes['REL'] == 'alternate') {
+        if ($element == 'ITEM') {
+          $items[$item]['LINK'] = $attributes['HREF'];
+        }
+        else {
+          $channel['LINK'] = $attributes['HREF'];
+        }
+      }
+      break;
     case 'ITEM':
       $element = $name;
       $item += 1;
+      break;
+    case 'ENTRY':
+      $element = 'ITEM';
+      $item += 1;
+      break;
   }
 
   $tag = $name;
@@ -300,6 +322,10 @@ function aggregator_element_end($parser, $name) {
     case 'IMAGE':
     case 'TEXTINPUT':
     case 'ITEM':
+    case 'ENTRY':
+    case 'CONTENT':
+    case 'INFO':
+    case 'ID':
       $element = '';
   }
 }
@@ -315,8 +341,26 @@ function aggregator_element_data($parser, $data) {
       $items[$item][$tag] .= $data;
       break;
     case 'IMAGE':
+    case 'LOGO':
       $image[$tag] .= $data;
       break;
+    case 'LINK':
+      if ($data) {
+        $items[$item][$tag] .= $data;
+      }
+      break;
+    case 'CONTENT':
+      $items[$item]['DESCRIPTION'] .= $data;
+      break;
+    case 'SUMMARY':
+      $items[$item]['DESCRIPTION'] .= $data;
+      break;
+    case 'TAGLINE':
+    case 'SUBTITLE':
+      $channel['DESCRIPTION'] .= $data;
+      break;
+    case 'INFO':
+    case 'ID':
     case 'TEXTINPUT':
       // The sub-element is not supported. However, we must recognize
       // it or its contents will end up in the item array.
@@ -488,7 +532,6 @@ function aggregator_parse_feed(&$data, $feed) {
       $value = preg_replace('/\Won[a-z]+\s*=[^>]+?>/i', '>', $value);
       $item[$key] = $value;
     }
-
     /*
     ** Resolve the item's title.  If no title is found, we use
     ** up to 40 characters of the description ending at a word