diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 0e4e31f0..80a12212 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -46,8 +46,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
     
   </article>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index bc149fc6..b8ae397e 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -43,8 +43,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 6a088793..86cf5470 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -69,8 +69,8 @@
         <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>
+<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>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index bc5418a7..fc05c4b3 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,8 +1,8 @@
 <?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;
 </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;
+&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;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -24,6 +24,6 @@ YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></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;
+&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;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 645c5890..f3a1a6f4 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -2,8 +2,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;
 </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;
-&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;
+&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;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -25,6 +25,6 @@ YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></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;
+&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;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 3d8100fd..2fa534aa 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?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/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><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;
+&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;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index 8e5477ba..40ad44c5 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,6 +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;
 </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;
+&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;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 9c00402e..97bb5256 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -69,8 +69,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
@@ -214,8 +214,8 @@ YEAH !</p>
         <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>
+<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>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 95bc7b85..36a1703c 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -46,8 +46,8 @@
         <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>
+<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>
 
     </div><!-- /.entry-content -->
     
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 52d0e5f9..49c0d422 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -53,8 +53,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
         <div class="comments">
       <h2>Comments !</h2>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 5a36c27e..eb39ae57 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -50,8 +50,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index e456805b..a87c85af 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -62,7 +62,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
@@ -142,8 +142,8 @@ as well as <strong>inline markup</strong>.</p>
         <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="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></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 -->
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index d291b9df..253d64ea 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 9316faf0..8c265d41 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -50,8 +50,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 6609ce25..24a53791 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -79,8 +79,8 @@
         <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="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></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 -->
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 587e2f97..c39e1a86 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 7b7cb84b..eab96fa1 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -79,8 +79,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                 <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 8e308821..5269ed70 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
@@ -140,8 +140,8 @@ YEAH !</p>
         <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="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></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 -->
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index aafcc69d..cb30a7d6 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -58,7 +58,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 6cb1c582..5df98726 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -38,7 +38,7 @@
     <h1 class="entry-title">This is a test page</h1>
         
         <p>Just an image.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 319f9595..85bc5a07 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -137,7 +137,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index c8653686..b7a257e4 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index ddec0f41..451b1031 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index a000affd..151eb64c 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 0f1e198b..98d22351 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -56,8 +56,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index f22a05a2..691f28f6 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -53,8 +53,8 @@
         <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="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></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>
 
     </div><!-- /.entry-content -->
         <div class="comments">