diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 4fb87fcf0..8f2df29a5 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -10,7 +10,6 @@
         {{- if ge $limit 1 -}}
         {{- $pages = $pages | first $limit -}}
         {{- end -}}
-        {{- $pages = (where $pages ".Params.tags" "!=" "bookmark") -}}
         {{- $pages = (where $pages ".Params.unlisted" "!=" "true") -}}
         {{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
         {{- printf "<?xml-stylesheet href=\"/rss.xsl\" type=\"text/xsl\"?>" | safeHTML }}
@@ -26,17 +25,20 @@
   <rights>{{.}}</rights>{{end}}{{ if not .Date.IsZero }}
   <updated>{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}</updated>{{ end }}
   {{ with .OutputFormats.Get "RSS" }}{{ end }}{{ range $pages }}
+  {{ if (and (not (in .Params.tags "bookmark")) (not (in .Params.tags "tool"))) }}
   <entry>
     <title>{{ .Title }}</title>
     <link rel="alternate" type="text/html" href="{{ .Permalink }}"/>
     <published>{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}</published>
     <updated>{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}</updated>
     <summary>{{ .Summary | html }}</summary>
+    <tags>{{.Params.tags}}</tags>
     <id>{{ .Permalink }}</id>{{ with .Site.Author.name }}
     <author>
       <name>{{.}}</name>
     </author>
-    {{end}}
+    {{ end }}
   </entry>
   {{ end }}
+  {{ end }}
 </feed>
diff --git a/static/rss.xsl b/static/rss.xsl
index 1d04b4cd2..42018f69a 100644
--- a/static/rss.xsl
+++ b/static/rss.xsl
@@ -46,6 +46,7 @@
 
                 <main class="container">
                     <h2>Recent blog posts</h2>
+
                     <xsl:for-each select="/atom:feed/atom:entry">
                         <article>
                             <h3>
@@ -56,6 +57,8 @@
                                     <xsl:value-of select="atom:title"/>
                                 </a>
                             </h3>
+                            <p>
+                                <xsl:value-of select="atom:tags"/></p>
                             <footer>
                                 <p>Published on <xsl:value-of select="substring(atom:published, 0, 11)"/></p>
                             </footer>