diff --git a/config.yml b/config.yml
index 16fa0b4..06cd1fc 100644
--- a/config.yml
+++ b/config.yml
@@ -11,19 +11,29 @@ params:
 
 summaryLength: 40
 
+
+mediaTypes:
+  "application/atom":
+    suffix: atom
 outputFormats:
   markdown:
     name: "txt"
     mediaType: "text/plain"
     isPlainText: true
+  atom:
+    name: "atom"
+    mediaType: "application/atom"
+    isPlainText: false
 outputs:
   home:
     - "html"
     - "rss"
+    - "atom"
     - "json"
   section:
     - "html"
     - "rss"
+    - "atom"
     - "txt"
   page:
     - "html"
diff --git a/layouts/_default/list.atom b/layouts/_default/list.atom
new file mode 100644
index 0000000..986e255
--- /dev/null
+++ b/layouts/_default/list.atom
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+	<subtitle>A subtitle.</subtitle>
+	<link href="{{ .Permalink }}" rel="self" />
+	<link href="{{ absURL "/" }}" />
+	<id>{{ .Permalink }}</id>
+	<updated>{{ now.Format .Site.Params.iso8601 }}</updated>
+  <icon>{{ absURL "/img/logo-transparent.png" }}</icon>
+  <logo>{{ absURL "/img/logo-transparent.png" }}</icon>
+  <author>
+    <name>{{ .Site.Params.author }}</name>
+    <uri>{{ absURL "/" }}</uri>
+  </author>
+  <rights type="html">
+    {{ partial "copyright.html" . | html }}
+  </rights>
+
+  {{ range .Data.Pages }}
+    <entry>
+      <title>{{ .Title }}</title>
+      <link href="{{ .Permalink }}" />
+      <id>{{ .Permalink }}</id>
+      <updated>{{ .Date.Format .Site.Params.iso8601 }}</updated>
+      <published>{{ .Date.Format .Site.Params.iso8601 }}</published>
+      <rights type="html">
+        {{ partial "copyright.html" . | html }}
+      </rights>
+      <summary>{{ .Summary }}</summary>
+      <content type="html">
+        {{ .Content | html }}
+      </content>
+      <author>
+        <name>{{ .Site.Params.author }}</name>
+        <uri>{{ absURL "/" }}</uri>
+      </author>
+    </entry>
+  {{ end }}
+</feed>
diff --git a/layouts/partials/copyright.html b/layouts/partials/copyright.html
new file mode 100644
index 0000000..12d533e
--- /dev/null
+++ b/layouts/partials/copyright.html
@@ -0,0 +1 @@
+&copy; {{ now.Year }} <a href='{{ absURL "" }}'>{{ .Site.Title }}</a>.
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 156b2e1..7de31a7 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,9 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-sm-6">
-        <p>
-          &copy; {{ now.Year }} <a href='{{ relURL "" }}'>{{ .Site.Title }}</a>.
-        </p>
+        <p>{{ partial "copyright.html" . }}</p>
         <p></p>
       </div>
       <div class="col-sm-6">