diff --git a/samples/content/2012-11-30_filename-metadata.rst b/samples/content/2012-11-30_filename-metadata.rst
new file mode 100644
index 00000000..b048103d
--- /dev/null
+++ b/samples/content/2012-11-30_filename-metadata.rst
@@ -0,0 +1,4 @@
+FILENAME_METADATA example
+#########################
+
+Some cool stuff!
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 0bccff9b..cb06dfa1 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -33,6 +33,8 @@
 <h1>Archives for A Pelican Blog</h1>
 
 <dl>
+    <dt>Fri 30 November 2012</dt>
+    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
     <dt>Wed 20 April 2011</dt>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 86cf5470..2d62b852 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -34,8 +34,32 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -44,14 +68,12 @@
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../second-article.html">read more</a>
+                                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index fc05c4b3..54c87905 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index f3a1a6f4..3081adc6 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index 40ad44c5..e71bd151 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
new file mode 100644
index 00000000..b7ae95a7
--- /dev/null
+++ b/tests/output/basic/filename_metadata-example.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>FILENAME_METADATA example</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="./">A Pelican Blog </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+        <section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./filename_metadata-example.html" rel="bookmark"
+           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+          </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+
+    </div><!-- /.entry-content -->
+    
+  </article>
+</section>
+        <section id="extras" class="body">
+                        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 97bb5256..488d1b08 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -34,8 +34,32 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -44,14 +68,12 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
             <a href="./second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="./second-article.html">read more</a>
+                                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 44bc876e..632387a4 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -37,6 +37,8 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
+    <dt>Fri 30 November 2012</dt>
+    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
     <dt>Wed 20 April 2011</dt>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index eb39ae57..8bb0dd1c 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -134,7 +134,7 @@
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-        Page 1 / 2
+        Page 1 / 3
             <a href="../author/alexis-metaireau2.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index a87c85af..59926d8c 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -39,6 +39,31 @@
                  
                             <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../filename_metadata-example.html" rel="bookmark"
+                           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Some cool stuff!</p>
+
+                <a class="readmore" href="../filename_metadata-example.html">read more</a>
+                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
+
+                 
                         <li><article class="hentry">    
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
@@ -121,37 +146,11 @@ as well as <strong>inline markup</strong>.</p>
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
                 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-
-                <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
                         <a href="../author/alexis-metaireau.html">&laquo;</a>
-                Page 2 / 2
+                Page 2 / 3
+            <a href="../author/alexis-metaireau3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/tests/output/custom/author/alexis-metaireau3.html b/tests/output/custom/author/alexis-metaireau3.html
new file mode 100644
index 00000000..5f2ecbb1
--- /dev/null
+++ b/tests/output/custom/author/alexis-metaireau3.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - Alexis Métaireau</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+            
+
+                 
+                            <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+
+                <a class="readmore" href="../unbelievable.html">read more</a>
+                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href="../author/alexis-metaireau2.html">&laquo;</a>
+                Page 3 / 3
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 24a53791..33acbd70 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -38,8 +38,35 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -51,14 +78,12 @@
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
index f8eb3219..5c8f9241 100644
--- a/tests/output/custom/feeds/all-en.atom.xml
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index b009d135..ae5fe30c 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index 786cb097..0ce2c837 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/misc.atom.xml b/tests/output/custom/feeds/misc.atom.xml
index dbf8bbfd..45c996f3 100644
--- a/tests/output/custom/feeds/misc.atom.xml
+++ b/tests/output/custom/feeds/misc.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/custom/feeds/misc.rss.xml b/tests/output/custom/feeds/misc.rss.xml
index bbc5a48e..a0fa290d 100644
--- a/tests/output/custom/feeds/misc.rss.xml
+++ b/tests/output/custom/feeds/misc.rss.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
new file mode 100644
index 00000000..8f6353cb
--- /dev/null
+++ b/tests/output/custom/filename_metadata-example.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>FILENAME_METADATA example</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+        <section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./filename_metadata-example.html" rel="bookmark"
+           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+          </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+
+    </div><!-- /.entry-content -->
+        <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "filename_metadata-example.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
+  </article>
+</section>
+        <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index eab96fa1..cc905735 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -38,8 +38,35 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -51,14 +78,12 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
             <a href="./second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="./second-article.html">read more</a>
+                <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
@@ -109,34 +134,9 @@
                 <a class="readmore" href="./article-1.html">read more</a>
                 <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="./article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Article 2</p>
-
-                <a class="readmore" href="./article-2.html">read more</a>
-                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-        Page 1 / 2
+        Page 1 / 3
             <a href="./index2.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 5269ed70..f0d2f948 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -39,6 +39,31 @@
                  
                             <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 2</p>
+
+                <a class="readmore" href="./article-2.html">read more</a>
+                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
+
+                 
                         <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
@@ -119,37 +144,11 @@ YEAH !</p>
                 <a class="readmore" href="./oh-yeah.html">read more</a>
                 <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="./unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-
-                <a class="readmore" href="./unbelievable.html">read more</a>
-                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
                         <a href="./index.html">&laquo;</a>
-                Page 2 / 2
+                Page 2 / 3
+            <a href="./index3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/tests/output/custom/index3.html b/tests/output/custom/index3.html
new file mode 100644
index 00000000..60f8633d
--- /dev/null
+++ b/tests/output/custom/index3.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+            
+
+                 
+                            <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+
+                <a class="readmore" href="./unbelievable.html">read more</a>
+                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href="./index2.html">&laquo;</a>
+                Page 3 / 3
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file