diff --git a/lib/rss.js b/lib/rss.js
index 6cd643eb..62255028 100644
--- a/lib/rss.js
+++ b/lib/rss.js
@@ -21,7 +21,7 @@ const generateRssItem = (item) => {
     <item>
       <guid>${SITE_URL}/items/${item.id}</guid>
       <title>${escapeXml(item.title)}</title>
-      <link>${link}</link>
+      <link>${escapeXml(link)}</link>
       <comments>${guid}</comments>
       <description><![CDATA[<a href="${guid}">Comments</a>]]></description>
       <pubDate>${new Date(item.createdAt).toUTCString()}</pubDate>
@@ -32,14 +32,14 @@ const generateRssItem = (item) => {
 export default function generateRssFeed (items) {
   const itemsList = items.map(generateRssItem)
   return `
-    <rss version="2.0">
+    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>
         <title>${SITE_TITLE}</title>
         <link>${SITE_URL}</link>
         <description>${SITE_SUBTITLE}</description>
         <language>en</language>
         <lastBuildDate>${new Date().toUTCString()}</lastBuildDate>
-        <link>${SITE_URL}</link>
+        <atom:link href="${SITE_URL}/rss" rel="self" type="application/rss+xml" />
         ${itemsList.join('')}
       </channel>
     </rss>