diff --git a/README.md b/README.md
index 073612d..80e46b7 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Read the [configuation guide](docs/CONFIG.md) for configuration help (in config.
 * post creation via the web frontend (no need to remote to your server to make a post)
 * multi user
 * powerful customisation
-* rss
+* rss, atom
 * timeline, user page, post page and tag specific page
 * edit/delete posts
 * hitcount
@@ -33,7 +33,6 @@ Read the [configuation guide](docs/CONFIG.md) for configuration help (in config.
 
 # Planned features/todo list
 * user specific RSS feeds
-* atom
 * federation (looks tricky)
 * All strings (including in edit and post page) customisable
     * formatable custom strings
diff --git a/views/syndication/global_atom.ejs b/views/syndication/global_atom.ejs
index 1c170af..9c72cd0 100644
--- a/views/syndication/global_atom.ejs
+++ b/views/syndication/global_atom.ejs
@@ -5,4 +5,18 @@
     <description><%= config.site_description %></description>
     <updated><%= new Date() %></updated>
     <id><%= config.site_url %></id>
+    <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+    <% if (posts[postID]["deleted"] != true) { %>
+    <entry>
+        <title><%= posts[postID]["title"] %></title>
+        <link><%= config.site_url %>/post/<%= postID %></link>
+        <summary><![CDATA[<%- converter.makeHtml(posts[postID]["content"]) %>]]></summary>
+        <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
+        <pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
+        <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
+        <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
+        <% } %>
+    </entry>
+    <% } %>
+    <% } %>
 </feed>
diff --git a/views/syndication/global_rss.ejs b/views/syndication/global_rss.ejs
index 73e43e6..d919514 100644
--- a/views/syndication/global_rss.ejs
+++ b/views/syndication/global_rss.ejs
@@ -5,10 +5,11 @@
         <link><%= config.site_url %></title>
         <description><%= config.site_description %></description>
         <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+        <% if (posts[postID]["deleted"] != true) { %>
         <item>
             <title><%= posts[postID]["title"] %></title>
             <link><%= config.site_url %>/post/<%= postID %></link>
-            <description><![CDATA[<%= converter.makeHtml(posts[postID]["content"]) %>]]></description>
+            <description><![CDATA[<%- converter.makeHtml(posts[postID]["content"]) %>]]></description>
             <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
             <pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
             <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
@@ -16,5 +17,6 @@
             <% } %>
         </item>
         <% } %>
+        <% } %>
     </channel>
 </rss>