diff --git a/ChangeLog b/ChangeLog
index 770185ae9..743019e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1643758 [import] Error #1264 importing NULL values in MySQL 5.0
- bug #1523747 [innodb] make warning about row count more visible
- bug #1676012 [auth] strip non-US-ASCII characters (RFC2616)
+- bug #1679440 Added FAQ entry about header errors under IIS caused by
+ an end-of-line character
- [gui] avoid displaying a wide selector in server selection
+ [core] added PMA_fatalError() and made use of it
. [core] added PMA_isValid() and PMA_ifSetOr() for variable handling
diff --git a/Documentation.html b/Documentation.html
index a69d719ba..bfef4bdbd 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2769,7 +2769,10 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
Edit your config.inc.php file and ensure there is nothing
(I.E. no blank lines, no spaces, no characters...) neither before the
<?php tag at the beginning, neither after the ?>
- tag at the end.
+ tag at the end. We also got a report from a user under IIS, that used
+ a zipped distribution kit: the file libraries/Config.class.php
+ contained an end-of-line character (hex 0A) at the end; removing this character
+ cleared his errors.