diff --git a/themes/xmpp-providers/layouts/_default/rss.xml b/themes/xmpp-providers/layouts/_default/rss.xml
new file mode 100644
index 0000000..21ccf89
--- /dev/null
+++ b/themes/xmpp-providers/layouts/_default/rss.xml
@@ -0,0 +1,71 @@
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- $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>
+    <language>{{ site.Language.LanguageCode }}</language>{{ with $authorEmail }}
+    <managingEditor>{{.}}{{ with $authorName }} ({{ . }}){{ end }}</managingEditor>{{ end }}{{ with $authorEmail }}
+    <webMaster>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</webMaster>{{ end }}{{ with .Site.Copyright }}
+    <copyright>{{ . }}</copyright>{{ end }}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ (index $pages.ByLastmod.Reverse 0).Lastmod.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 }}
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{- with $authorEmail }}<author>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</author>{{ end }}
+      <guid>{{ .Permalink }}</guid>
+      <description>{{ .Content | transform.XMLEscape | safeHTML }}</description>
+    </item>
+    {{- end }}
+  </channel>
+</rss>
\ No newline at end of file
diff --git a/themes/xmpp-providers/layouts/index.xml b/themes/xmpp-providers/layouts/index.xml
deleted file mode 100644
index 4095b0a..0000000
--- a/themes/xmpp-providers/layouts/index.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<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>
-    <link href="{{ .Permalink }}index.xml" rel="self"/>
-    <link href="{{ .Permalink }}"/>
-    {{ if not .Date.IsZero }}
-        <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
-    {{ end }}
-    <id>{{ .Permalink }}</id>
-    {{ with .Site.Params.author.name }}
-        <author>
-            <name>{{ . }}</name>
-                {{ with $.Site.Author.email }}
-            <email>{{ . }}</email>
-            {{end}}
-        </author>
-    {{end}}
-    <generator>Hugo -- gohugo.io</generator>
-    {{ range where (where .Site.Pages ".Section" "blog") "Kind" "page" }}
-        <entry>
-        {{ `<title type="html"><![CDATA[` | safeHTML }}{{ .Title }}]]></title>
-        <link href="{{ .Permalink }}"/>
-        <id>{{ .Permalink }}</id>
-        {{ with .Site.Params.author.name }}
-            <author>
-                <name>{{ . }}</name>
-            </author>
-        {{end}}
-        <published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
-        <updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
-        {{ `<content type="html"><![CDATA[` | safeHTML }}{{ .Content }}]]></content>
-        </entry>
-    {{ end }}
-</feed>
diff --git a/themes/xmpp-providers/layouts/partials/footer.html b/themes/xmpp-providers/layouts/partials/footer.html
index 887184b..74d70b9 100644
--- a/themes/xmpp-providers/layouts/partials/footer.html
+++ b/themes/xmpp-providers/layouts/partials/footer.html
@@ -8,7 +8,7 @@
                 &nbsp;&middot;&nbsp;
                 <a href="/contact/" class="footer-link"><i class="fa-regular fa-comment-dots"></i>&nbsp;Contact</a>
                 &nbsp;&middot;&nbsp;
-                <a href="/index.xml" class="footer-link"><i class="fa-solid fa-rss"></i>&nbsp;News Feed</a>
+                <a href="/blog/index.xml" class="footer-link"><i class="fa-solid fa-rss"></i>&nbsp;News Feed</a>
                 &nbsp;&middot;&nbsp;
                 <a href="https://fosstodon.org/@xmpp_providers" target="_blank" class="footer-link"><i class="fa-brands fa-mastodon"></i>&nbsp;Mastodon</a>
                 &nbsp;&middot;&nbsp;
diff --git a/themes/xmpp-providers/layouts/partials/head.html b/themes/xmpp-providers/layouts/partials/head.html
index bc9ac57..2db6d87 100644
--- a/themes/xmpp-providers/layouts/partials/head.html
+++ b/themes/xmpp-providers/layouts/partials/head.html
@@ -45,7 +45,7 @@
             <link rel="stylesheet" type="text/css" href="{{ $style.RelPermalink }}" integrity="{{$secureStyle.Data.Integrity}}">
         {{- end }}
     {{- end }}
-    <link rel="alternate" type="application/atom" href="/index.xml" title="XMPP Providers" />
+    <link rel="alternate" type="application/atom" href="/blog/index.xml" title="XMPP Providers" />
     <link rel="canonical" href="{{ .Permalink }}">
     <link rel="me" href="https://fosstodon.org/@xmpp_providers">
     <!--  Make website accessible without JavaScript. -->
diff --git a/themes/xmpp-providers/layouts/shortcodes/feed.html b/themes/xmpp-providers/layouts/shortcodes/feed.html
index ed0ab02..53cac73 100644
--- a/themes/xmpp-providers/layouts/shortcodes/feed.html
+++ b/themes/xmpp-providers/layouts/shortcodes/feed.html
@@ -1 +1 @@
-<a href="/index.xml" class="text-body-secondary"><i class="fa-solid fa-rss"></i>&nbsp;News Feed</a>
\ No newline at end of file
+<a href="/blog/index.xml" class="text-body-secondary"><i class="fa-solid fa-rss"></i>&nbsp;News Feed</a>
\ No newline at end of file