diff --git a/ChangeLog b/ChangeLog
index 8112f59ea..64772dde8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-12-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * db_details_qbe.php: error when generating joins 
+    * Documentation.html: FAQ 6.22: default bookmark execution
+
 2003-12-23 Marc Delisle  <lem9@users.sourceforge.net>
     * css/phpmyadmin.css.php: Patch 864334, preserve white-space between quotes
     * db_datadict.php, db_printview.php: bug 863713: printing on non-IE browser
diff --git a/Documentation.html b/Documentation.html
index f06f7f52b..d435ce589 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -3500,6 +3500,15 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     letter of either the key or the display field.
 
 </p>
+<h4>
+    [6.22] Bookmarks: Can I execute a default bookmark automatically
+    when entering Browse mode for a table? 
+</h4>
+<p>
+    Yes. If a bookmark has the same label as a table name, it will be
+    executed. 
+</p>
+ 
 <a name="faqproject"></a><br />
 <h3>[7. phpMyAdmin project]</h3>