diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index abe4b97cd..6d049a0c3 100644
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -561,6 +561,6 @@ categories: ["funny"]
 	b.Assert(funny.Parent(), qt.Equals, cat)
 
 	b.AssertFileContent("public/categories/funny/index.xml", `<link>http://example.com/p/</link>`)
-	// TODO https://github.com/gohugoio/hugo/issues/6909	b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)
+	b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)
 
 }
diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index f64f18ee1..c9dec8988 100644
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -21,7 +21,12 @@ var EmbeddedTemplates = [][2]string{
 	{`_default/robots.txt`, `User-agent: *`},
 	{`_default/rss.xml`, `{{- $pctx := . -}}
 {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
-{{- $pages := $pctx.RegularPages -}}
+{{- $pages := slice -}}
+{{- if eq $.Kind "taxonomyTerm" -}}
+{{- $pages = $pctx.Pages -}}
+{{- else -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- end -}}
 {{- $limit := .Site.Config.Services.RSS.Limit -}}
 {{- if ge $limit 1 -}}
 {{- $pages = $pages | first $limit -}}
diff --git a/tpl/tplimpl/embedded/templates/_default/rss.xml b/tpl/tplimpl/embedded/templates/_default/rss.xml
index 3e17f48c6..5ec2025b6 100644
--- a/tpl/tplimpl/embedded/templates/_default/rss.xml
+++ b/tpl/tplimpl/embedded/templates/_default/rss.xml
@@ -1,6 +1,11 @@
 {{- $pctx := . -}}
 {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
-{{- $pages := $pctx.RegularPages -}}
+{{- $pages := slice -}}
+{{- if eq $.Kind "taxonomyTerm" -}}
+{{- $pages = $pctx.Pages -}}
+{{- else -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- end -}}
 {{- $limit := .Site.Config.Services.RSS.Limit -}}
 {{- if ge $limit 1 -}}
 {{- $pages = $pages | first $limit -}}