diff --git a/httpclient-cache/src/site/apt/index.apt b/httpclient-cache/src/site/apt/index.apt
index 91ece88ad..fd45c1363 100644
--- a/httpclient-cache/src/site/apt/index.apt
+++ b/httpclient-cache/src/site/apt/index.apt
@@ -32,11 +32,11 @@ HttpClient Cache
 
     This module provides support for HTTP/1.1 response caching.
 
-    {{{apidocs/index.html}Javadocs}}
+    {{{./apidocs/index.html}Javadocs}}
     
-    {{{xref/index.html}Project sources}}
+    {{{./xref/index.html}Project sources}}
     
-    {{{dependencies.html}Dependencies}}    
+    {{{./dependencies.html}Dependencies}}    
     
-    {{{issue-tracking.html}Issue Tracking}}    
+    {{{./issue-tracking.html}Issue Tracking}}    
 
diff --git a/httpclient/src/site/apt/index.apt b/httpclient/src/site/apt/index.apt
index f30adcc4b..a3634d5c2 100644
--- a/httpclient/src/site/apt/index.apt
+++ b/httpclient/src/site/apt/index.apt
@@ -33,12 +33,12 @@ HttpClient
     This module is a full-featured,
     {{{http://www.ietf.org/rfc/rfc2616.txt}RFC 2616}} compliant
     HTTP client built on top of
-    {{{/httpcomponents/httpcomponents-core/index.html}HttpCore}}
+    {{{./httpcomponents/httpcomponents-core/index.html}HttpCore}}
 
-    {{{apidocs/index.html}Javadocs}}
+    {{{./apidocs/index.html}Javadocs}}
     
-    {{{xref/index.html}Project sources}}
+    {{{./xref/index.html}Project sources}}
     
-    {{{dependencies.html}Dependencies}}    
+    {{{./dependencies.html}Dependencies}}    
     
-    {{{issue-tracking.html}Issue Tracking}}    
+    {{{./issue-tracking.html}Issue Tracking}}    
diff --git a/httpmime/src/site/apt/index.apt b/httpmime/src/site/apt/index.apt
index c80c66dd8..a4a1c8ea3 100644
--- a/httpmime/src/site/apt/index.apt
+++ b/httpmime/src/site/apt/index.apt
@@ -32,11 +32,11 @@ HttpMime
 
     This module provides support for MIME multipart encoded entities.
 
-    {{{apidocs/index.html}Javadocs}}
+    {{{./apidocs/index.html}Javadocs}}
     
-    {{{xref/index.html}Project sources}}
+    {{{./xref/index.html}Project sources}}
     
-    {{{dependencies.html}Dependencies}}    
+    {{{./dependencies.html}Dependencies}}    
     
-    {{{issue-tracking.html}Issue Tracking}}    
+    {{{./issue-tracking.html}Issue Tracking}}    
 
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 4f5f72303..b5d614afb 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -47,9 +47,9 @@ HttpClient Overview
 
 {Documentation}
 
-    * HttpClient Tutorial ( {{{tutorial/html}HTML}} / {{{tutorial/pdf/httpclient-tutorial.pdf}PDF}} )
+    * HttpClient Tutorial ( {{{./tutorial/html}HTML}} / {{{./tutorial/pdf/httpclient-tutorial.pdf}PDF}} )
     
-    * Some examples of HttpClient in action can be found {{{examples.html}here}}
+    * Some examples of HttpClient in action can be found {{{./examples.html}here}}
     
 {Features}
 
diff --git a/src/site/apt/quickstart.apt b/src/site/apt/quickstart.apt
index d8adc8841..ad1d28f3f 100644
--- a/src/site/apt/quickstart.apt
+++ b/src/site/apt/quickstart.apt
@@ -51,11 +51,11 @@ HttpClient Quick Start
     []
     
     [[2]] Take a look at the HttpClient tutorial shipped with the release package or avaialble
-    {{{tutorial/html/}online}} to learn HttpClient API.
+    {{{./tutorial/html/}online}} to learn HttpClient API.
     
     [[3]] Another good way of getting started with HttpClient is by seeing it in action. Take 
-    a look at the samples shipped with the release package or available {{{examples.html}online}}.
+    a look at the samples shipped with the release package or available {{{./examples.html}online}}.
     
     [[4]] Please note that HttpClient is not a browser. Importantly it lacks UI, cache, HTML 
     renderer and a JavaScript engine. To learn more about the scope of HttpClient please refer to 
-    {{{primer.html}HttpClient Primer}}
\ No newline at end of file
+    {{{./primer.html}HttpClient Primer}}
\ No newline at end of file