diff --git a/ChangeLog b/ChangeLog
index ab7d1fe3f..c6c712c15 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ $Source$
 2002-10-30 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: Better display of the query if parser is
       disabled.
+    * libraries/sqlparser.lib.php3:
+      - ANSI Comments were not recognized if the two '-' characters were
+        followed up by a line feed character instead of a space one;
+      - Fixed the misinterpretation of Windows / Mac line feeds.
 
 2002-10-28 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/dutch.inc.php3: Fixed a bug in the Dutch language files
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 8bdbe0ac3..37fa720a2 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -171,6 +171,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             return $sql;
         }
 
+        // rabus: Convert all line feeds to Unix style
+        $sql = str_replace("\r\n", "\n", $sql);
+        $sql = str_replace("\r", "\n", $sql);
+
         $len = $GLOBALS['PMA_strlen']($sql);
         if ($len == 0) {
             return array();
@@ -227,7 +231,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             // ANSI style --
             if (($c == '#')
                 || (($count2 + 1 < $len) && ($c == '/') && ($sql[$count2 + 1] == '*'))
-                || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && ($sql[$count2 + 2] == ' '))) {
+                || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && ereg("(\n|[space])", $sql[$count2 + 2]))) {
                 $count2++;
                 $pos  = 0;
                 $type = 'bad';