diff --git a/templates/_default/atom.xml b/templates/_default/atom.xml
index 19557bd..2d3cf14 100644
--- a/templates/_default/atom.xml
+++ b/templates/_default/atom.xml
@@ -9,7 +9,7 @@
 	<title>{{ .Title }}</title>
 	<updated>{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}</updated>
 	<link href="{{ .URL | safeURL }}" rel="alternate"/>
-	<content>{{ .Content | safeHTML }}</content>
+	<content>{{ .Content }}</content>
 </entry>
 {{ end -}}
 </feed>
diff --git a/templates/atom.xml b/templates/atom.xml
new file mode 100644
index 0000000..d479fb9
--- /dev/null
+++ b/templates/atom.xml
@@ -0,0 +1,18 @@
+{{ `<?xml version="1.0" encoding="utf-8"?>` | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+<id>{{ .URL }}</id>
+<title>{{ .Title }}</title>
+<updated>{{ site.Generated.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+<link href="{{ .URL | safeURL }}" rel="alternate"/>
+{{ range .Pages }}<entry>
+	<id>{{ .URL }}</id>
+	<title>{{ .Title }}</title>
+	<updated>{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+	<link href="{{ .URL | safeURL }}" rel="alternate"/>
+	<content>{{ .Content }}</content>
+	<author>
+		<name>Morgan McMillian</name>
+	</author>
+</entry>
+{{ end -}}
+</feed>