diff --git a/haunt.scm b/haunt.scm
index 959af366cde515e7ce88cc4bc7fcc96aed89d5f4..b4ceb953a231e14bd7d89b21b0e8299830b68c5f 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -5,6 +5,7 @@
 			 (haunt html)
 			 (haunt builder blog)
 			 (haunt builder atom)
+			 (haunt builder rss)
 			 (haunt builder assets)
 			 (haunt reader commonmark)
 			 (local micronews paged-blog)
@@ -27,8 +28,10 @@
       #:readers (list commonmark-reader)
       #:builders (list (paged-blog #:theme local-site-theme
 								   #:prefix "post")
-					   (atom-feed)
-					   (atom-feeds-by-tag)
+					   (atom-feed #:blog-prefix "post")
+					   (atom-feeds-by-tag #:prefix "tags"
+										  #:blog-prefix "post")
+					   (rss-feed #:blog-prefix "post")
 					   (static-page "meta" "Meta"
 									%meta-page)
 					   (static-page "irc" "IRC"
diff --git a/local/theme.scm b/local/theme.scm
index 71ae58cd0696dc4344941aceef2edd219b749c5c..df358d0f01c059ad88bbe9dd6dd609b268e04ec0 100644
--- a/local/theme.scm
+++ b/local/theme.scm
@@ -25,7 +25,7 @@
 		   (span "Tags: "
 				 ,(intersperse
 				   (map (lambda (tag)
-						  (link tag (format #f "/feeds/tags/~a.xml" tag)))
+						  (link tag (format #f "/tags/~a.xml" tag)))
 						(or (post-ref post 'tags) '()))
 				   ", "))
 		   ,@(if (and site prefix)
@@ -53,7 +53,8 @@
 					  (link "IRC" "/irc.html")
 					  (link "WhatsApp" "/whatsapp.html")
 					  (link "Beitragen" "/meta.html")
-					  (link "Atom Feed" "/feed.xml"))))
+					  (link "Atom" "/feed.xml")
+					  (link "RSS" "/rss-feed.xml"))))
         ,body)))
    #:post-template (make-post-generator)
    #:collection-template