diff --git a/templates/bulletproof/entries_summary.tpl b/templates/bulletproof/entries_summary.tpl
index 01fd44c1..4caec09c 100644
--- a/templates/bulletproof/entries_summary.tpl
+++ b/templates/bulletproof/entries_summary.tpl
@@ -5,8 +5,9 @@
         {foreach from=$entries item="entries"}
             {foreach from=$entries.entries item="entry"}
                 <dl class="archive_summary {cycle values='archive_summary_odd,archive_summary_even'}">
-                    <h4 class="archive_summary_title"><a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></h4>
-                    <dt class="archive_summary_postdate">{$entry.timestamp|@formatTime:$template_option.date_format}</dt>
+                    <dt class="archive_summary_title"><a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></dt>
+                    <dd class="archive_summary_postdate">{$entry.timestamp|@formatTime:$template_option.date_format}</dd>
+                  {if $template_option.footerauthor == 'true' or $template_option.footercategories == 'true'}
                     <dd class="archive_summary_postdetails">
                         {if $template_option.footerauthor == 'true'}
                             {$CONST.POSTED_BY} <address class="author"><a href="{$entry.link_author}">{$entry.author}</a></address>
@@ -17,6 +18,7 @@
                             {/if}
                         {/if}
                     </dd>
+                  {/if}
                 </dl>
             {/foreach}
         {/foreach}
diff --git a/templates/default/feed_2.0.tpl b/templates/default/feed_2.0.tpl
index 80643b83..a0af1bc1 100644
--- a/templates/default/feed_2.0.tpl
+++ b/templates/default/feed_2.0.tpl
@@ -9,7 +9,6 @@
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
    {$namespace_display_dat}>
 <channel>
-    {$channel_display_dat}
     <title>{$metadata.title}</title>
     <link>{$metadata.link}</link>
     <description>{$metadata.description}</description>
diff --git a/templates/default/feed_atom0.3.tpl b/templates/default/feed_atom0.3.tpl
index ba72bab8..e564effa 100644
--- a/templates/default/feed_atom0.3.tpl
+++ b/templates/default/feed_atom0.3.tpl
@@ -8,7 +8,6 @@
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
    xmlns:wfw="http://wellformedweb.org/CommentAPI/">
-    {$channel_display_dat}
     <link href="{$serendipityBaseURL}rss.php?version=atom0.3" rel="service.feed" title="{$metadata.title}" type="application/x.atom+xml" />
     <link href="{$serendipityBaseURL}"                        rel="alternate"    title="{$metadata.title}" type="text/html" />
     <link href="{$serendipityBaseURL}rss.php?version=2.0"     rel="alternate"    title="{$metadata.title}" type="application/rss+xml" />
diff --git a/templates/default/feed_atom1.0.tpl b/templates/default/feed_atom1.0.tpl
index c3d070e0..335b4a2a 100644
--- a/templates/default/feed_atom1.0.tpl
+++ b/templates/default/feed_atom1.0.tpl
@@ -8,7 +8,6 @@
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
    xmlns:wfw="http://wellformedweb.org/CommentAPI/">
-    {$channel_display_dat}
     <link href="{$self_url}" rel="self" title="{$metadata.title}" type="application/atom+xml" />
     <link href="{$serendipityBaseURL}"                        rel="alternate"    title="{$metadata.title}" type="text/html" />
     <link href="{$serendipityBaseURL}rss.php?version=2.0"     rel="alternate"    title="{$metadata.title}" type="application/rss+xml" />