diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index f8b02662..6b11cb09 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -54,7 +54,7 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
-        {% if SOCIAL %}
+        {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
                 <div class="social">
                         <h2>social</h2>
                         <ul>
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 80a12212..aa43a448 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -53,7 +53,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index cb06dfa1..07a62bcc 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -54,7 +54,14 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index b372d6ca..de3717fa 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 1a18cb47..ebe9b8a7 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 6b83b062..42762c26 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index e6f65a11..c6e75b8b 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -86,7 +86,14 @@ as well as <strong>inline markup</strong>.</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index f945d04a..8dd4c810 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -36,7 +36,14 @@
     <li><a href="./category/yeah.html">yeah</a></li>
 </ul>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 896d9222..d9fcd2a5 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index b8ae397e..ad18cd9a 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -119,7 +119,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 2d62b852..7e8307a0 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -100,7 +100,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 37dfde63..7c6cb721 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -62,7 +62,14 @@
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
index b7ae95a7..730e9c41 100644
--- a/tests/output/basic/filename_metadata-example.html
+++ b/tests/output/basic/filename_metadata-example.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 488d1b08..f44ffbc9 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -245,7 +245,14 @@ YEAH !</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index ab090b58..1900e76c 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -60,7 +60,14 @@ YEAH !</p>
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 655ae272..3447b3a5 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -38,7 +38,14 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 43e2c2d4..c9192c94 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -38,7 +38,14 @@
 
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index aa30292e..a5abce27 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 7319c87f..f6b42fec 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 06b012cb..891f5c35 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -134,7 +134,14 @@ YEAH !</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index f6c56d4b..ce7c1c62 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -78,7 +78,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 4ee92b7d..dffd1768 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -104,7 +104,14 @@ as well as <strong>inline markup</strong>.</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 11f21b6d..108353c2 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -62,7 +62,14 @@
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index d88192a0..6e1a31ad 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 8533dbdc..c201b5c0 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 0188c07e..e098e2cf 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -66,7 +66,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 36a1703c..a56096d9 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">