diff --git a/Felipe Martin.lektorproject b/Felipe Martin.lektorproject
index ed9581c..113e210 100644
--- a/Felipe Martin.lektorproject	
+++ b/Felipe Martin.lektorproject	
@@ -5,6 +5,7 @@ url_style = absolute
 
 [packages]
 lektor-markdown-highlighter = 0.1
+lektor-atom = 0.2
 
 [servers.production]
 target = rsync://fmartingrcom@static-1.scaleway.fra1.ops.fmartingr.com/var/www/fmartingr.com/html
diff --git a/configs/atom.ini b/configs/atom.ini
new file mode 100644
index 0000000..7e97176
--- /dev/null
+++ b/configs/atom.ini
@@ -0,0 +1,7 @@
+[blog]
+name = Felipe Martin's Blog
+source_path = /
+url_path = /feed.xml
+items = site.query('/blog')
+item_model = blog-post
+limit = 25
diff --git a/templates/blog/rss.html b/templates/blog/rss.html
new file mode 100644
index 0000000..c7de3b4
--- /dev/null
+++ b/templates/blog/rss.html
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0">
+<channel>
+    <title>{{ config.rss_blog_title }}</title>
+    <description>{{ config.rss_blog_description }}</description>
+    <link>{{ config.base_url }}</link>
+    {% for item in items %}
+    <item>
+        <title><![CDATA[{{ item.title }}]]></title>
+        <description><![CDATA[{{ item.content|safe }}]]></description>
+        <link>{{ config.base_url }}{{ item.get_absolute_url() }}</link>
+        <pubDate>{{ item.date|dt('%a, %d %b %Y %H:%M:%S %z') }}</pubDate>
+    </item>
+    {% endfor %}
+</channel>
+</rss>