diff --git a/conferences/index.php b/conferences/index.php
index 568e5bf7e..85ff626ec 100644
--- a/conferences/index.php
+++ b/conferences/index.php
@@ -20,11 +20,11 @@ EOT;
 
 unset($RSIDEBAR_DATA);
 
-site_header("PHP Conferences around the world", array("layout_workaround" => $layout_workaround, 'headtags' => '<link rel="alternate" type="application/rss+xml" title="PHP: Conference announcements" href="' . $MYSITE . 'conferences/news.rss" />'));
+site_header("PHP Conferences around the world", array("layout_workaround" => $layout_workaround, 'headtags' => '<link rel="alternate" type="application/atom+xml" title="PHP: Conference announcements" href="' . $MYSITE . 'conferences/feed.atom" />'));
 
 print_news($NEWS_ENTRIES["conferences"]);
 
 site_footer(
-    array("rss" => "/conferences/news.rss") // Add a link to the feed
+    array("atom" => "/feed.atom") // Add a link to the feed
 );
 
diff --git a/include/layout.inc b/include/layout.inc
index f3fe1b14c..32d9c5684 100644
--- a/include/layout.inc
+++ b/include/layout.inc
@@ -243,6 +243,9 @@ function site_footer($config = array())
     $rsslink       = (isset($config["rss"]) ?
         "<a href=\"{$config["rss"]}\">RSS</a> |" :
         "");
+    $atomlink      = (isset($config["atom"]) ?
+        "<a href=\"{$config["atom"]}\">Atom</a> |" :
+        "");
     $viewsource    = (isset($_SERVER['BASE_PAGE']) ?
         "<a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a> |" :
         "");
@@ -262,7 +265,7 @@ function site_footer($config = array())
 {$layout_helper}</div>
 
 <div id="footnav">
- $rsslink $viewsource
+ $rsslink $atomlink $viewsource
  <a href="/credits.php">credits</a> |$stats
  <a href="/sitemap.php">sitemap</a> |
  <a href="/contact.php">contact</a> |
@@ -593,7 +596,7 @@ function news_archive_sidebar()
 
 <p>
  For the latest news, <a href="/index.php">check the homepage</a>,
- or <a href="/news.rss">our RSS feed</a>.
+ or <a href="/feed.atom">our Atom feed</a>.
 </p>
 
 <h3>Archives by year</h3>
diff --git a/index.php b/index.php
index 8e4091d17..27b8a0288 100644
--- a/index.php
+++ b/index.php
@@ -97,8 +97,7 @@ $SIDEBAR_DATA = '
 
 <h3>Syndication</h3>
 <p>
- You can grab our news as an RSS feed via a daily dump in a file
- named <a href="/news.rss">news.rss</a>.
+ You can grab our news as an <a href="/feed.atom">Atom feed</a>.
 </p>';
 
 $MIRROR_IMAGE = '';
@@ -200,7 +199,7 @@ $RSIDEBAR_DATA = $MIRROR_IMAGE . $rel . $RSIDEBAR_DATA;
 site_header("Hypertext Preprocessor",
     array(
         'onload' => 'boldEvents();',
-        'headtags' => '<link rel="alternate" type="application/rss+xml" title="PHP: Hypertext Preprocessor" href="' . $MYSITE . 'news.rss" />',
+        'headtags' => '<link rel="alternate" type="application/atom+xml" title="PHP: Hypertext Preprocessor" href="' . $MYSITE . 'feed.atom" />',
         'link' => array(
             array(
                 "rel"   => "search",
@@ -249,6 +248,6 @@ print_news($NEWS_ENTRIES["frontpage"]);
 
 <?php
 site_footer(
-    array("rss" => "/news.rss") // Add a link to the feed at the bottom
+    array("atom" => "/feed.atom") // Add a link to the feed at the bottom
 );