diff --git a/layouts/_default/index.rss.rss b/layouts/_default/index.rss.rss
new file mode 100644
index 0000000..8700ec3
--- /dev/null
+++ b/layouts/_default/index.rss.rss
@@ -0,0 +1,30 @@
+{{- $pctx := . -}}
+{{- if .IsHome -}}
+  {{ $pctx = .Site }}
+{{- end -}}
+{{- $pages := slice -}}
+{{- if or $.IsHome $.IsSection -}}
+  {{- $pages = $pctx.RegularPages -}}
+{{- else -}}
+  {{- $pages = $pctx.Pages -}}
+{{- end -}}
+{{- $limit := .Site.Config.Services.RSS.Limit -}}
+{{- if ge $limit 1 -}}
+  {{- $pages = $pages | first $limit -}}
+{{- end -}}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ .Site.Title }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent content on {{ .Site.Title }}</description>
+    <generator>Hugo {{ hugo.Version }} -- gohugo.io</generator>
+    {{ with .Site.LanguageCode }}<language>{{ . }}</language>{{ end }}
+    {{ with .Site.Author }}<managingEditor>{{ .name }} &lt;{{ .email }}&gt;</managingEditor>{{ end }}
+    {{ with .Site.Author.email }}<webMaster>{{ .name }} &lt;{{ .email }}&gt;</webMaster>{{ end }}
+    {{ with .Site.Copyright }}<copyright>{{ . }}</copyright>{{ end }}
+    {{ if not .Date.IsZero }}<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{ with .OutputFormats.Get "RSS" }}{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}{{ end }}
+    {{ range $pages }}{{ .Render "rss_item" }}{{ end }}
+  </channel>
+</rss>
diff --git a/layouts/_default/index.rss.xml b/layouts/_default/index.rss.xml
deleted file mode 100644
index 5c3a806..0000000
--- a/layouts/_default/index.rss.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-{{- $pctx := . -}}
-{{- if .IsHome -}}
-  {{ $pctx = .Site }}
-{{- end -}}
-{{- $pages := slice -}}
-{{- if or $.IsHome $.IsSection -}}
-  {{- $pages = $pctx.RegularPages -}}
-{{- else -}}
-  {{- $pages = $pctx.Pages -}}
-{{- end -}}
-{{- $limit := .Site.Config.Services.RSS.Limit -}}
-{{- if ge $limit 1 -}}
-  {{- $pages = $pages | first $limit -}}
-{{- end -}}
-{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
-    <link>{{ .Permalink }}</link>
-    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
-    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
-    {{- with .OutputFormats.Get "RSS" -}}
-      {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
-    {{- end -}}
-    {{ range $pages }}
-      {{ if ne .Type "page" }}
-        <item>
-          <title>{{ .Title }}</title>
-          <link>{{ .Permalink }}</link>
-          <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-          {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
-          <guid>{{ .Permalink }}</guid>
-          <description>
-            {{ if eq .Section "photos" }}
-              {{ $thumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) }}
-              <img src="{{ $thumbnail.Permalink }}">
-            {{ end }}
-            {{ .Content | html }}
-          </description>
-          {{ with index (.GetTerms "series") 0 }}<category domain="{{ `/series` | absURL }}">{{ .Title }}</category>{{ end }}
-          {{ range .GetTerms "categories" }}
-            <category domain="{{ `/categories` | absURL }}">{{ .Title }}</category>
-          {{ end }}
-          {{ range .GetTerms "tags" }}
-            <category domain="{{ `/tags` | absURL }}">{{ .Title }}</category>
-          {{ end }}
-        </item>
-      {{ end }}
-    {{ end }}
-  </channel>
-</rss>
diff --git a/layouts/blog/rss_item.rss b/layouts/blog/rss_item.rss
new file mode 100644
index 0000000..52d59e6
--- /dev/null
+++ b/layouts/blog/rss_item.rss
@@ -0,0 +1,6 @@
+<item>
+  {{ partial "rss_item_metadata.rss" . }}
+  <description>{{ `<![CDATA[` | safeHTML }}
+    {{ .Content | html }}
+  ]]></description>
+</item>
diff --git a/layouts/partials/rss_item_metadata.rss b/layouts/partials/rss_item_metadata.rss
new file mode 100644
index 0000000..e91378f
--- /dev/null
+++ b/layouts/partials/rss_item_metadata.rss
@@ -0,0 +1,11 @@
+<title>{{ .Title }}</title>
+<link>{{ .Permalink }}</link>
+<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+{{ with .Site.Author.email }}<author>{{ . }}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+<guid>{{ .Permalink }}</guid>
+{{- range slice "series" "categories" "tags" -}}
+  {{ range $.GetTerms . }}
+  {{- $domain := (.Site.GetPage (printf "/%s" .Section)).Permalink -}}
+  <category domain="{{ $domain }}">{{ .Title }}</category>
+  {{ end }}
+{{- end -}}
diff --git a/layouts/photos/rss_item.rss b/layouts/photos/rss_item.rss
new file mode 100644
index 0000000..f8fe198
--- /dev/null
+++ b/layouts/photos/rss_item.rss
@@ -0,0 +1,8 @@
+{{- $thumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
+<item>
+  {{ partial "rss_item_metadata.rss" . }}
+  <description>{{ `<![CDATA[` | safeHTML }}
+    <img src="{{ $thumbnail.Permalink }}">
+    {{ .Content | html }}
+  ]]></description>
+</item>