diff --git a/src/feeds.lisp b/src/feeds.lisp
index 559ab09..83ba3a0 100644
--- a/src/feeds.lisp
+++ b/src/feeds.lisp
@@ -19,7 +19,7 @@
   "Render the default RSS and ATOM feeds along with any TAG-FEEDS."
   (let ((posts (by-date (find-all 'post))))
     (dolist (feed '((:path "rss.xml" :template :rss-feed)
-                    (:path "feed.atom" :template :atom-feed)))
+                    (:path "atom.xml" :template :atom-feed)))
       (apply #'render-feed posts feed))
     (dolist (feed tag-feeds)
       (apply #'render-feed posts (list :path (format nil "~A-rss.xml" feed)
diff --git a/themes/atom.tmpl b/themes/atom.tmpl
index 2b5ff5c..4108c19 100644
--- a/themes/atom.tmpl
+++ b/themes/atom.tmpl
@@ -22,7 +22,7 @@
       <name>{$config.author}</name>
       <uri>{$config.domain}</uri>
     </author>
-    <content type="html">{$post.text |noAutoescape}</content>
+    <content type="html">{$post.text |escapeHtml}</content>
   </entry>
   {/foreach}