diff --git a/ChangeLog b/ChangeLog
index bd7ddac14..5c6fea57b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-10-17 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * Documentation.html: Added some notes about the MySQL 4.1 branch. See bug
+      report #623665 for more details.
+
 2002-10-17 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/dutch: update, thanks to Ivo Teel.
 
diff --git a/Documentation.html b/Documentation.html
index 6d92ec1d7..fe41dae89 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -126,7 +126,10 @@
         support</font>;
     </li>
     <li>
-        MySQL (tested with 3.21.x, 3.22.x, 3.23.x and 4.0.x);
+        MySQL (tested with 3.21.x, 3.22.x, 3.23.x and 4.0.x);<br />
+        <font color="#bb0000">Note: Because of a major change in the definition
+        syntax of string field types, this version of phpMyAdmin probably won't
+        work correctly with MySQL&nbsp;&gt;=&nbsp;4.1.0!</font>
     </li>
     <li>
         a web-browser (doh!).
@@ -1739,8 +1742,12 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     to use php&nbsp;&gt;=&nbsp;4.1 since older versions of php are not
     compatible to MySQL&nbsp;4.<br />
     Furthermore, several users reported problems with phpMyAdmin related to
-    bugs in MySQL&nbsp;4. <font color="#bb0000">MySQL&nbsp;4 is still an alpha
+    bugs in MySQL&nbsp;4. <font color="#bb0000">MySQL&nbsp;4 is still a beta
     release and should be used for test purposes only!</font>
+    Because of a major change in the definition syntax of string field types,
+    this version of phpMyAdmin probably won't work correctly with
+    MySQL&nbsp;&gt;=&nbsp;4.1.0! We will work on the support as soon as
+    MySQL&nbsp;4.1.0 is released.
 </p>
 
 <p>