diff --git a/templates/feeds/blogmark.html b/templates/feeds/blogmark.html
index 54c9664..37554a3 100644
--- a/templates/feeds/blogmark.html
+++ b/templates/feeds/blogmark.html
@@ -4,3 +4,6 @@
 {% if obj.via_title %}
     <p>Via <a href="{{ obj.via_url }}">{{ obj.via_title }}</a></p>
 {% endif %}
+{% if obj.tags.count %}
+    <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+{% endif %}
diff --git a/templates/feeds/everything.html b/templates/feeds/everything.html
index 82a49c4..884f361 100644
--- a/templates/feeds/everything.html
+++ b/templates/feeds/everything.html
@@ -1,5 +1,8 @@
 {% if obj.is_entry %}
     {{ obj.body|safe }}
+    {% if obj.tags.count %}
+        <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+    {% endif %}
 {% elif obj.is_blogmark %}
     {% include "feeds/blogmark.html" %}
 {% elif obj.is_quotation %}
diff --git a/templates/feeds/quotation.html b/templates/feeds/quotation.html
index b37df75..e6ac44b 100644
--- a/templates/feeds/quotation.html
+++ b/templates/feeds/quotation.html
@@ -1 +1,4 @@
-<blockquote{% if obj.source_url %} cite="{{ obj.source_url }}"{% endif %}>{{ obj.body }}</blockquote><p class="cite">&mdash; {% if obj.source_url %}<a href="{{ obj.source_url }}">{{ obj.source }}</a>{% else %}{{ obj.source }}{% endif %}
\ No newline at end of file
+<blockquote{% if obj.source_url %} cite="{{ obj.source_url }}"{% endif %}>{{ obj.body }}</blockquote><p class="cite">&mdash; {% if obj.source_url %}<a href="{{ obj.source_url }}">{{ obj.source }}</a>{% else %}{{ obj.source }}{% endif %}</p>
+{% if obj.tags.count %}
+    <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+{% endif %}