diff --git a/templates/Category.j2.html b/templates/Category.j2.html
index 14de732..6d84470 100644
--- a/templates/Category.j2.html
+++ b/templates/Category.j2.html
@@ -6,7 +6,7 @@
     <link rel="alternate" type="application/rss+xml" title="{{ category.title }} RSS feed" href="{{ category.feed }}" />
     <link rel="alternate" type="application/atom+xml" title="{{ category.title }} ATOM feed" href="{{ category.feed }}atom.xml" />
     <link rel="alternate" type="application/json" title="{{ category.title }} JSON feed" href="{{ category.feed }}index.json" />
-    <link rel="feed" title="{{ category.title}} feed" href="{{ category.url }}" />
+    <link rel="feed" title="{{ category.title}} feed" href="http://www.unmung.com/feed?feed={{ category.feed|urlencode }}" />
 {% endblock %}
 
 {% block pagination %}
diff --git a/templates/Home.j2.html b/templates/Home.j2.html
index 971732a..fce1efb 100644
--- a/templates/Home.j2.html
+++ b/templates/Home.j2.html
@@ -3,14 +3,14 @@
 {% block title %}{{ post.headline }} - {{ site.name }}{% endblock %}
 
 {% block meta %}
+{% set feed = site.url + '/feed/' %}
     <meta name="author" content="{{ site.author.name }} <{{ site.author.email }}>" />
     <meta name="description" content="{{ post.description|e }}" />
     <link rel="canonical" href="{{ site.url }}" />
-    {% for category, latest in elements %}
-    <link rel="alternate" type="application/rss+xml" title="{{ category.title }} RSS feed" href="{{ category.feed }}" />
-    <link rel="alternate" type="application/atom+xml" title="{{ category.title }} ATOM feed" href="{{ category.feed }}atom.xml" />
-    <link rel="feed" title="{{ category.title}} feed" href="{{ category.url }}" />
-    {% endfor %}
+    <link rel="alternate" type="application/rss+xml" title="{{ site.title }} RSS feed" href="{{ feed }}" />
+    <link rel="alternate" type="application/atom+xml" title="{{ site.title }} ATOM feed" href="{{ feed }}atom.xml" />
+    <link rel="alternate" type="application/json" title="{{ site.title }} JSON feed" href="{{ feed }}index.json" />
+    <link rel="feed" title="{{ site.title}} feed" href="http://www.unmung.com/feed?feed={{ feed|urlencode }}" />
 {% endblock %}
 
 {% block content %}