diff --git a/Documentation.html b/Documentation.html
index 3257e4e90..62d395c31 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -969,7 +969,16 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
 <hr noshade="noshade" width="100%" />
 
 <h2>FAQ - Frequently Asked Questions</h2>
+<a class="navigation" href="#faqserver">Server</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqconfig">Configuration</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqlimitations">Limitations</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqmultiuser">Multi-user</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqbrowsers">Browsers</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqusing">Usage tips</a> &nbsp;-&nbsp;
+<a class="navigation" href="#faqproject">Project</a>
 
+
+<a name="faqserver"></a>
 <h3>[Server]</h3>
 <p>
     <b>I'm running php 4+ and my server is crashing each time a specific action
@@ -1173,6 +1182,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
 </p>
 
 
+<a name="faqconfig"></a>
 <h3>[Configuration]</h3>
 
 <p>
@@ -1261,6 +1271,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
     the phpMyAdmin configuration file.
 </p>
 
+<a name="faqlimitations"></a>
 <h3>[Known limitations]</h3>
 <a name="login_bug"></a>
 <p>
@@ -1285,6 +1296,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
     is limited by the system administrator, and time limit is enforced.
 </p>
 
+<a name="faqmultiuser"></a>
 <h3>[ISPs, multi-user installations ]</h3>
 <p>
     <b>I'm an ISP. Can I setup one central copy of phpMyAdmin or do I need to
@@ -1364,6 +1376,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
     would let a user create/manage his/her database(s).
 </p>
 
+<a name="faqbrowsers"></a>
 <h3>[Browsers or client OS]</h3>
 <p>
     <b>I get an out of memory error, and my controls are non-functional, when
@@ -1444,6 +1457,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
 </p>
 
 
+<a name="faqusing"></a>
 <h3>[Using phpMyAdmin]</h3>
 <p>
     <b>I can't insert new rows into a table - MySQL brings up a SQL-error.</b>
@@ -1495,6 +1509,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
     this document.
 </p>
 
+<a name="faqproject"></a>
 <h3>[phpMyAdmin project]</h3>
 <p>
     <b>I have found a bug. How do I inform developers?</b>