diff --git a/ChangeLog b/ChangeLog
index a9b289f59..88afc5272 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-20 Alexander M. Turek  <me@derrabus.de>
+    * Documentation.html: Added a note about Connector/PHP to FAQ 1.17.
+
 2006-03-19 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php: bug #1445853, overhead should use the
       same display units
diff --git a/Documentation.html b/Documentation.html
index 42fbec6fe..51907bd0c 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -2294,7 +2294,13 @@ ALTER TABLE `pma_column_comments`
     extension of your choice to a MySQL client library of at least the same
     minor version since the one that is bundled with some php distributions is
     rather old and might cause problems <a href="#faq1_17a">
-       (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br />
+       (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.
+    If your webserver is running on a windows system, you might want to try
+    MySQL's
+    <a href="http://dev.mysql.com/downloads/connector/php/">Connector/PHP</a>
+    instead of the MySQL / MySQLi extensions that are bundled with the official
+    php Win32 builds.
+    <br />
     MySQL&nbsp;5.1 is not yet supported.</p>
 
 <h5 id="faq1_17a">