diff --git a/i2p2www/blog/helpers.py b/i2p2www/blog/helpers.py
index 0122385f..f5989720 100644
--- a/i2p2www/blog/helpers.py
+++ b/i2p2www/blog/helpers.py
@@ -23,8 +23,8 @@ LIST_METATAGS = [
 #####################
 # Blog helper methods
 
-def get_blog_feed_items(num=0):
-    posts = get_blog_posts(num, True)
+def get_blog_feed_items(num=0, category=None):
+    posts = get_blog_posts(num, True, category=category)
     items = []
     for post in posts:
         meta = post[1]
diff --git a/i2p2www/blog/views.py b/i2p2www/blog/views.py
index 8e6e36d0..cdef7765 100644
--- a/i2p2www/blog/views.py
+++ b/i2p2www/blog/views.py
@@ -45,10 +45,12 @@ def blog_rss():
     pass
 
 @cache.cached(600)
-def blog_atom():
-    # TODO: Only output beginning of each blog post
-    feed = AtomFeed('I2P Blog', feed_url=request.url, url=request.url_root)
-    items = get_blog_feed_items(10)
+def blog_atom(category=None):
+    feed_title = 'I2P Blog'
+    if category:
+        feed_title = 'I2P Blog Category: %s' % category
+    feed = AtomFeed(feed_title, feed_url=request.url, url=request.url_root)
+    items = get_blog_feed_items(10, category=category)
     for item in items:
         feed.add(item['title'],
                  item['content'],
diff --git a/i2p2www/pages/blog/category.html b/i2p2www/pages/blog/category.html
index e81a7b8d..9cd89583 100644
--- a/i2p2www/pages/blog/category.html
+++ b/i2p2www/pages/blog/category.html
@@ -1,4 +1,5 @@
 {% extends "blog/index.html" %}
 {% block title %}{{ _('Blog Category') }}: {{ category }}{% endblock %}
 {% block headextra %}
+    <link href="{{ get_url('blog_atom', category=category) }}" type="application/atom+xml" rel="alternate" title="{% trans %}I2P Blog ATOM Feed for Category: {{ category }}{% endtrans %}" />
 {%- endblock %}
diff --git a/i2p2www/urls.py b/i2p2www/urls.py
index a27833fb..9008d09b 100644
--- a/i2p2www/urls.py
+++ b/i2p2www/urls.py
@@ -45,6 +45,7 @@ url('/<lang:lang>/blog/category/<string:category>/page/<int:page>', 'blog.views.
 url('/<lang:lang>/blog/post/<path:slug>', 'blog.views.blog_post')
 url('/<lang:lang>/feed/blog/rss', 'blog.views.blog_rss')
 url('/<lang:lang>/feed/blog/atom', 'blog.views.blog_atom')
+url('/<lang:lang>/feed/blog/category/<string:category>/atom', 'blog.views.blog_atom')
 
 url('/<lang:lang>/meetings/', 'meetings.views.meetings_index', defaults={'page': 1})
 url('/<lang:lang>/meetings/page/<int:page>', 'meetings.views.meetings_index')