diff --git a/extra/webapps/planet/planet.xml b/extra/webapps/planet/planet.xml
index 340e6c4bee..412f42c64e 100644
--- a/extra/webapps/planet/planet.xml
+++ b/extra/webapps/planet/planet.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:title>Concatenative Planet</t:title>
+	<t:title>[ planet-factor ]</t:title>
 
 	<table width="100%" cellpadding="10">
 		<tr>
@@ -38,6 +38,17 @@
 					</t:each>
 				</ul>
 
+				<hr/>
+
+				<p>
+				    <strong>planet-factor</strong> is an Atom/RSS aggregator that collects the
+				    contents of <a href="http://factorcode.org/">Factor</a>-related blogs. It is inspired by
+				    <a href="http://planet.lisp.org">Planet Lisp</a>.
+				</p>
+				<p>
+				    <img src="http://factorcode.org/feed-icon-14x14.png" />
+				    <t:a t:href="$planet/feed.xml">Syndicate</t:a>
+				</p>
 			</td>
 		</tr>
 	</table>
diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index a7c88837a8..64b9898991 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -38,13 +38,7 @@ IN: websites.concatenative
 
 TUPLE: factor-website < dispatcher ;
 
-: <factor-website> ( -- responder )
-    factor-website new-dispatcher
-        <pastebin> "pastebin" add-responder
-        <planet> "planet" add-responder
-        <wiki> "wiki" add-responder
-        <user-admin> "user-admin" add-responder
-        URL" /wiki/view/Front Page" <redirect-responder> "" add-responder
+: <configuration> ( responder -- responder' )
     "Factor website" <login-realm>
         "Factor website" >>name
         allow-registration
@@ -55,6 +49,12 @@ TUPLE: factor-website < dispatcher ;
         { factor-website "page" } >>template
     test-db <alloy> ;
 
+: <factor-website> ( -- responder )
+    factor-website new-dispatcher
+        <wiki> "wiki" add-responder
+        <user-admin> "user-admin" add-responder
+        URL" /wiki/view/Front Page" <redirect-responder> "" add-responder ;
+
 SYMBOL: key-password
 SYMBOL: key-file
 SYMBOL: dh-file
@@ -71,12 +71,19 @@ SYMBOL: dh-file
     "resource:basis/openssl/test/server.pem" key-file set-global
     "password" key-password set-global
     common-configuration
-    <factor-website> main-responder set-global ;
+    <factor-website>
+        <pastebin> "pastebin" add-responder
+        <planet> "planet" add-responder
+    <configuration>
+    main-responder set-global ;
 
 : init-production ( -- )
     common-configuration
     <vhost-dispatcher>
         <factor-website> "concatenative.org" add-responder
+        <pastebin> "pastebin.factorcode.org" add-responder
+        <planet> "planet.factorcode.org" add-responder
+    <configuration>
     main-responder set-global ;
 
 : <factor-secure-config> ( -- config )