diff --git a/ChangeLog b/ChangeLog
index 1a00e11c8..67d8e843c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-13 Michal Čihař  <michal@cihar.com>
+    * Documentation.html: Fix URL rewriting not to match empty parts.
+
 2005-10-13 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * left.php: preselect db if only one db
     * server_privileges.php:
diff --git a/Documentation.html b/Documentation.html
index 582be2db0..ba40a7e4a 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -2834,8 +2834,8 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 <pre>
 RewriteEngine On
 RewriteBase /path_to_phpMyAdmin
-RewriteRule ^([a-zA-Z0-9_]*)/([a-zA-Z0-9_]*)$ index.php?db=$1&amp;table=$2 [R]
-RewriteRule ^([a-zA-Z0-9_]*)$ index.php?db=$1 [R]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&amp;table=$2 [R]
+RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
 </pre>
 
 <a name="faqconfig"></a><br />