diff --git a/core/src/main/resources/hudson/model/Job/rssHeader.jelly b/core/src/main/resources/hudson/model/Job/rssHeader.jelly
index 18e20db56f1d15eeb707f12a5c52ef2f934d50ba..2558f9b87d5b58c6b44259ce3303ffcad019beb0 100644
--- a/core/src/main/resources/hudson/model/Job/rssHeader.jelly
+++ b/core/src/main/resources/hudson/model/Job/rssHeader.jelly
@@ -24,8 +24,8 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  <link rel="alternate" title="Jenkins:${it.name} (all builds)" href="rssAll" type="application/rss+xml" />
+  <link rel="alternate" title="Jenkins:${it.name} (all builds)" href="rssAll" type="application/atom+xml" />
   <link rel="alternate" title="Jenkins:${it.name} (all builds) (RSS 2.0)" href="rssAll?flavor=rss20" type="application/rss+xml" />
-  <link rel="alternate" title="Jenkins:${it.name} (failed builds)" href="rssFailed" type="application/rss+xml" />
+  <link rel="alternate" title="Jenkins:${it.name} (failed builds)" href="rssFailed" type="application/atom+xml" />
   <link rel="alternate" title="Jenkins:${it.name} (failed builds) (RSS 2.0)" href="rssFailed?flavor=rss20" type="application/rss+xml" />
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly
index 98cbbbd637603ffaeb72a334258815ceb51fe782..a8d1b128ddf5ec6eb99428eb72d96cb1cfde752b 100644
--- a/core/src/main/resources/hudson/model/View/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly
@@ -29,9 +29,9 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header title="Jenkins">
-    <link rel="alternate" title="Jenkins:${it.viewName} (all builds)" href="${rootURL}/${it.url}rssAll" type="application/rss+xml" />
+    <link rel="alternate" title="Jenkins:${it.viewName} (all builds)" href="${rootURL}/${it.url}rssAll" type="application/atom+xml" />
     <link rel="alternate" title="Jenkins:${it.viewName} (all builds) (RSS 2.0)" href="${rootURL}/${it.url}rssAll?flavor=rss20" type="application/rss+xml" />
-    <link rel="alternate" title="Jenkins:${it.viewName} (failed builds)" href="${rootURL}/${it.url}rssFailed" type="application/rss+xml" />
+    <link rel="alternate" title="Jenkins:${it.viewName} (failed builds)" href="${rootURL}/${it.url}rssFailed" type="application/atom+xml" />
     <link rel="alternate" title="Jenkins:${it.viewName} (failed builds) (RSS 2.0)" href="${rootURL}/${it.url}rssFailed?flavor=rss20" type="application/rss+xml" />
   </l:header>
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index b4ffcd388584e4272b98c3f7f5e8980ac123fde4..b0121b6bdf42a0a90c660514c236f699e98931cf 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -41,13 +41,13 @@ THE SOFTWARE.
       RSS link
     -->
     <span class="build-rss-links">
-        <a class="build-rss-all-icon" href="${it.baseUrl}/rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+        <a class="build-rss-all-icon" href="${it.baseUrl}/rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Atom feed" height="16" width="16"/></a>
         <st:nbsp/>
-        <a class="build-rss-all-link" href="${it.baseUrl}/rssAll">RSS ${%for all}</a>
+        <a class="build-rss-all-link" href="${it.baseUrl}/rssAll">Atom feed ${%for all}</a>
         <st:nbsp/>
-        <a class="build-rss-failed-icon" href="${it.baseUrl}/rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+        <a class="build-rss-failed-icon" href="${it.baseUrl}/rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Atom feed" height="16" width="16"/></a>
         <st:nbsp/>
-        <a class="build-rss-failed-link" href="${it.baseUrl}/rssFailed">RSS ${%for failures}</a>
+        <a class="build-rss-failed-link" href="${it.baseUrl}/rssFailed">Atom feed ${%for failures}</a>
     </span>
   </j:parse>
 
diff --git a/core/src/main/resources/lib/hudson/rssBar.jelly b/core/src/main/resources/lib/hudson/rssBar.jelly
index 4db12af6c9c851cd5ad6e7582d95d3a7328c0c18..172710611103ec0575cbb8584ea5daca2e3c8ef1 100644
--- a/core/src/main/resources/lib/hudson/rssBar.jelly
+++ b/core/src/main/resources/lib/hudson/rssBar.jelly
@@ -27,19 +27,19 @@ THE SOFTWARE.
   <div id="rss-bar">
     <a href="${rootURL}/legend" class="rss-bar-legend-link">${%Legend}</a>
     <span class="rss-bar-item">
-      <a href="rssAll" class="rss-bar-item-icon-link"><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Feed"/></a>
+      <a href="rssAll" class="rss-bar-item-icon-link"><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Atom feed"/></a>
       <st:nbsp/>
-      <a href="rssAll" class="rss-bar-item-link">RSS ${%for all}</a>
+      <a href="rssAll" class="rss-bar-item-link">Atom feed ${%for all}</a>
     </span>
     <span class="rss-bar-item">
-      <a href="rssFailed" class="rss-bar-item-icon-link"><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Feed"/></a>
+      <a href="rssFailed" class="rss-bar-item-icon-link"><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Atom feed"/></a>
       <st:nbsp/>
-      <a href="rssFailed" class="rss-bar-item-link">RSS ${%for failures}</a>
+      <a href="rssFailed" class="rss-bar-item-link">Atom feed ${%for failures}</a>
     </span>
     <span class="rss-bar-item">
-      <a href="rssLatest" class="rss-bar-item-icon-link" ><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Feed"/></a>
+      <a href="rssLatest" class="rss-bar-item-icon-link" ><img src="${imagesURL}/atom.gif" class="icon-rss icon-sm" alt="Atom feed"/></a>
       <st:nbsp/>
-      <a href="rssLatest" class="rss-bar-item-link">RSS ${%for just latest builds}</a>
+      <a href="rssLatest" class="rss-bar-item-link">Atom feed ${%for just latest builds}</a>
     </span>
   </div>
 </j:jelly>