diff --git a/ChangeLog b/ChangeLog
index 72583af1e..11373db16 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-05-11 Michal Čihař  <michal@cihar.com>
+    * libraries/sqlparser.lib.php: Modified pretty printer to display nicer
+      queries generated by our db search.
+
 2004-05-10 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
     * left.php: commit for Garvin: fix for wrong group expanding (group
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index cd836e415..a3af56c27 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -1652,7 +1652,6 @@ if ($is_minimum_common == FALSE) {
 
         // These reserved words do NOT get a newline placed near them.
         $keywords_no_newline               = array(
-            'AND',
             'AS',
             'ASC',
             'DESC',
@@ -1660,10 +1659,11 @@ if ($is_minimum_common == FALSE) {
             'HOUR',
             'INTERVAL',
             'IS',
+            'LIKE',
             'NOT',
             'NULL',
             'ON',
-            'OR'
+            'REGEXP'
         );
         $keywords_no_newline_cnt           = 12;