diff --git a/ChangeLog b/ChangeLog
index c1082e6d2..aec2cc843 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,8 @@ $Source$
 	  ("server" is always the first one).
 	* tbl_properties.php3, lines 1212-1249: fixed bad dislays with Opera and
       removed trailing whitespaces.
-	* Documentation.html: removed trailing whitespaces.
+	* Documentation.html: added some words and a faq entry about IE and php
+	  cookie bugs.
 	* libraries/display_tbl.lib.php3: very very light optimizations.
 	* tbl_change.php3: fixed bug #535984 - JS Error in tbl_change.php3.
 	* tbl_replace.php3: fixed bug #536707 - undefined variables.
diff --git a/Documentation.html b/Documentation.html
index 2c4862e30..882a9e2f8 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -256,7 +256,11 @@
 <ul>
     <li>Http and cookie authentication modes are recommended in a multi-user
         environment where you want to give users access to their own database
-        and don't want them to play around with others.<br /><br /></li>
+        and don't want them to play around with others.
+        <br />
+        Nevetheless be aware that MS Internet Explorer seems to be really
+        buggy about cookies, at least till version 6. And php 4.1.1 is also a
+        bit buggy in this area!<br /><br /></li>
 
     <li>Http and cookie authentication modes are secure: the MySQL password
         does not need to be set in the phpMyAdmin configuration file. (except
@@ -1353,6 +1357,18 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
     Testing needs to be done for Konqueror 2.2.2.<br />
 </p>
 
+<p>
+    <b>I can't use the cookie authentication mode because Internet Explorer
+       never stores the cookies.</b>
+    <br />
+    MS Internet Explorer seems to be really buggy about cookies, at least till
+    version 6. And thanks to Andrew Zivolup we've traced also a php 4.1.1 bug
+    in this area!
+    <br />
+    Then, If you're running php 4.1.1, try to upgrade or downgrade... it may
+    works!
+</p>
+
 <p>
     <b>In Internet Explorer 5.0, I get Javascript errors when browsing my
        rows.</b>