diff --git a/_config.yml b/_config.yml
index 9b254aa..c1aabac 100644
--- a/_config.yml
+++ b/_config.yml
@@ -71,6 +71,8 @@ collections:
   updates:
     output: true
     permalink: /updates/:year/:month/:day/:title
+    sort_by: date
+    reverse: false
 
 feed:
   path: /atom.xml
diff --git a/atom.xml b/atom.xml
index bc9e931..6eb93ce 100644
--- a/atom.xml
+++ b/atom.xml
@@ -7,10 +7,17 @@ layout: none
     <title>peachmoon.moe blog and updates</title>
     <description>site updates and blog posts by mana</description>
     <link>{{ site.url }}</link>
-    {% for post in site.posts %}
+
+ <!-- Combine blog posts and updates -->
+    {% assign all_posts = site.posts | concat: site.collections.updates.docs %}
+    {% assign sorted_posts = all_posts | sort: 'date' %}
+
+
+    {% for post in sorted_posts %}
       {% unless post.draft %}
         <item>
           <title>{{ post.title | xml_escape }}</title>
+          <category>{{ post.collection }}</category>
           <description>{{ post.content | xml_escape }}</description>
           <pubDate>{{ post.date | date_to_xmlschema }}</pubDate>
           <link>{{ post.url | prepend: site.url }}</link>
@@ -18,14 +25,5 @@ layout: none
         </item>
       {% endunless %}
     {% endfor %}
-
-    {% for update in site.updates %}
-    <item>
-        <title>{{ update.title | xml_escape }}</title>
-        <description>{{ update.content | xml_escape }}</description>
-        <pubDate>{{ update.date | date_to_xmlschema }}</pubDate>
-        <guid isPermaLink="true">{{ update.url | prepend: site.url }}</guid>
-    </item>
-    {% endfor %}
   </channel>
 </rss>
\ No newline at end of file