diff --git a/extra/rss/rss.factor b/extra/rss/rss.factor
index 0d399e620f..1f7105bf57 100644
--- a/extra/rss/rss.factor
+++ b/extra/rss/rss.factor
@@ -1,12 +1,10 @@
-! Copyright (C) 2006 Chris Double.
+! Copyright (C) 2006 Chris Double, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: rss
-! USING: kernel http-client xml xml-utils xml-data errors io strings
-!    sequences xml-writer parser-combinators lazy-lists entities ;
 USING: xml.utilities kernel assocs
     strings sequences xml.data xml.writer
     io.streams.string combinators xml xml.entities io.files io
-    http.client ;
+    http.client namespaces xml.generator hashtables ;
 
 : ?children>string ( tag/f -- string/f )
     [ children>string ] [ f ] if* ;
@@ -87,3 +85,22 @@ C: <entry> entry
     ] [
         2drop "Error retrieving newsfeed file" throw
     ] if ;
+
+! Atom generation
+: simple-tag, ( content name -- )
+    [ , ] tag, ;
+
+: (generate-atom) ( entry -- )
+    "entry" [
+        dup entry-title "title" simple-tag,
+        "link" over entry-link "href" associate contained*,
+        dup entry-pub-date "published" simple-tag,
+        entry-description "content" simple-tag,
+    ] tag, ;
+
+: generate-atom ( feed -- xml )
+    "feed" [
+        dup feed-title "title" simple-tag,
+        "link" over feed-link "href" associate contained*,
+        feed-entries [ (generate-atom) ] each
+    ] make-xml ;
diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index c7f4e4c2f1..31ef4222ba 100644
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -125,3 +125,15 @@ SYMBOL: last-update
     [ update-thread ] in-thread ;
 
 "planet" "planet-factor" "extra/webapps/planet" web-app
+
+: merge-feeds ( feeds -- feed )
+    [ feed-entries ] map concat sort-entries ;
+
+: planet-feed ( -- feed )
+    default-blogroll get [ second news-get ] map merge-feeds 
+    >r "[ planet-factor ]" "http://planet.factorcode.org" r> <entry>
+    generate-atom ;
+
+: feed.xml planet-feed ;
+
+\ feed.xml { } define-action