2 files changed, 40 insertions, 29 deletions

diff --git a/templates/feed.xml b/templates/feed.xml
index cf9e359..915c000 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -16,9 +16,22 @@
 
     $if(layout.is_categorized_list)$
         $for(pages.date_desc)$
-            $it.pages.date_desc:feed_entry()$
+            $for(it.pages.date_desc)$
+                $if(it.url)$
+                    <entry>
+                        <category term="$pages.date_desc.namespace.full$" label="$pages.date_desc.title$"/>
+                        $it:feed_entry()$
+                    </entry>
+                $endif$
+            $endfor$
         $endfor$
     $else$
-        $pages.date_desc:feed_entry()$
+        $for(pages.date_desc)$
+            $if(it.url)$
+                <entry>
+                    $it:feed_entry()$
+                </entry>
+            $endif$
+        $endfor$
     $endif$
 </feed>
diff --git a/templates/feed_entry.xml b/templates/feed_entry.xml
index f8108f6..03d6569 100644
--- a/templates/feed_entry.xml
+++ b/templates/feed_entry.xml
@@ -1,27 +1,25 @@
-<entry>
-    <id>$it.url.full$</id>
-    <title><![CDATA[$it.title$]]></title>
-    <link href="$it.url.full$"/>
-    <published>$it.date.rfc3339$</published>
-    <updated>$it.last_update.rfc3339$</updated>
-    $if(it.author)$
-        $for(it.author)$
-            <author>
-                <name>$it.name$</name>
-                $if(it.email)$
-                    <email>$it.email$</email>
-                $endif$
-            </author>
-        $endfor$
-    $else$
-        $for(author)$
-            <author>
-                <name>$author.name$</name>
-                $if(author.email)$
-                    <email>$author.email$</email>
-                $endif$
-            </author>
-        $endfor$
-    $endif$
-    <content type="html"><![CDATA[$it.content$]]></content>
-</entry>
+<id>$it.url.full$</id>
+<title><![CDATA[$it.title$]]></title>
+<link href="$it.url.full$"/>
+<published>$it.date.rfc3339$</published>
+<updated>$it.last_update.rfc3339$</updated>
+$if(it.author)$
+    $for(it.author)$
+        <author>
+            <name>$it.name$</name>
+            $if(it.email)$
+                <email>$it.email$</email>
+            $endif$
+        </author>
+    $endfor$
+$else$
+    $for(author)$
+        <author>
+            <name>$author.name$</name>
+            $if(author.email)$
+                <email>$author.email$</email>
+            $endif$
+        </author>
+    $endfor$
+$endif$
+<content type="html"><![CDATA[$it.content$]]></content>