diff --git a/config.toml b/config.toml
index f489121..e1f7e4c 100644
--- a/config.toml
+++ b/config.toml
@@ -13,7 +13,7 @@ compile_sass = true
 build_search_index = true
 
 # Feed
-generate_feed = false
+generate_feed = true
 feed_filename = "atom.xml" # or rss.xml, also used for loading template
 feed_limit = 20
 
diff --git a/templates/atom.xml b/templates/atom.xml
deleted file mode 100644
index c8b2add..0000000
--- a/templates/atom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>{{ page.title }}</title>
-  <link rel="self" href="https://oyam.ca/{{page.path}}" type="application/atom+xml"/>
-  <link rel="alternate" href="https://oyam.ca/" type="text/html"/>
-  <updated>{{ site.now_utc.strftime('%Y-%m-%dT%H:%M:%SZ') }}</updated>
-  <rights>Copyright © {{ site.now_utc.strftime('%Y') }}, Mayo Jordanov</rights>
-  <id>tag:oyam.ca,2010:/</id>
-  <author>
-    <name>{{ site.author.name }}</name>
-    <uri>https://oyam.ca/</uri>
-  </author>
-
-  {% for res in site.tags.articles[:site.feed_length] %}
-  <entry>
-    <id>tag:oyam.ca,2010:{{ res.path }}</id>
-    <author>
-      <name>{% if res.author -%}{{ res.author }}{%- else %}{{ site.author.name }}{%- endif %}</name>
-      <uri>https://oyam.ca/</uri>
-    </author>
-    <published>{{ res.created.strftime('%Y-%m-%dT%H:%M:%SZ') }}</published>
-    {% set updated = res.updated or res.created -%}
-    <updated>{{ updated.strftime('%Y-%m-%dT%H:%M:%SZ') }}</updated>
-    {% if res.type == 'link' -%}
-    <link rel="related" href="https://oyam.ca/{{ res.path }}" type="text/html"/>
-    {%- endif -%}
-    <link rel="alternate" href="{% if res.type == 'link' -%}{{ res.href }}{%- else %}https://oyam.ca/{{ res.path }}{%- endif %}" type="text/html"/>
-    {% set title = res.title or res.contents|striptags|truncate(28) %}
-    <title type="html"><![CDATA[{{ title }}]]></title>
-
-    {% if res.type == 'post' and res.title -%}
-    <summary type="html"><![CDATA[
-      {{ res.excerpt }}
-    ]]></summary>
-    {%- endif -%}
-
-    <content type="html" xml:lang="en"><![CDATA[
-      {{ res.contents }}
-      {% if res.type == "quote" and res.contents != "" -%} &mdash; {{ res.author }}{%- endif %}
-    ]]></content>
-  </entry>
-  {% endfor %}
-</feed>
diff --git a/templates/base.html b/templates/base.html
index d137aa3..2aa812c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -47,8 +47,11 @@
     <!-- <link rel="stylesheet" href="/media/css/handheld.css" media="only screen"/> -->
     {% endblock %}
 
-
-    <link rel="alternate" type="application/atom+xml" href="/feed/atom.xml"/>
+    {% block rss %}
+      {% if config.generate_feed %}
+    <link rel="alternate" type="application/atom+xml" title="RSS" href="{{ get_url(path="/atom.xml") | safe }}">
+      {% endif %}
+    {% endblock rss %}
 
     {% for link, _ in config.extra.rel_me -%}
     <link rel="me" href="{{ config.extra.links[link] | safe }}"/>