diff --git a/src/feed.njk b/src/feed.njk
index 47166a9..b00c5d7 100644
--- a/src/feed.njk
+++ b/src/feed.njk
@@ -15,16 +15,20 @@ metadata:
   <link href="{{ metadata.base | addPathPrefixToFullUrl }}"/>
   <updated>{{ collections.posts | getNewestCollectionItemDate | dateToRfc3339 }}</updated>
   <id>{{ metadata.base | addPathPrefixToFullUrl }}</id>
-  <author>
-    <name>{{ metadata.author.name }}</name>
-  </author>
   {%- for post in collections.posts | reverse %}
   {%- set absolutePostUrl %}{{ post.url | htmlBaseUrl(metadata.base) }}{% endset %}
   <entry>
+    <author>
+      <name>{{ post.data.author.name }}</name>
+      <uri>{{ post.data.author.href }}</uri>
+    </author>
     <title>{{ post.data.title }}</title>
     <link href="{{ absolutePostUrl }}"/>
     <updated>{{ post.date | dateToRfc3339 }}</updated>
     <id>{{ absolutePostUrl }}</id>
+    {%- for tag in post.data.tags %}
+    <category term="{{ tag }}" />
+    {%- endfor %}
     <content type="html">
       &lt;img src="{{ post.data.image.src }}.webp?width=1200" alt="{{ post.data.image.alt }}"&gt;
       {{ post.content | renderTransforms(post.data.page, metadata.base) }}