diff --git a/ChangeLog b/ChangeLog
index 00ad9a0fc..148f5fbb4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,8 +7,8 @@ $Source$
 
 2002-05-24 Loïc Chapeaux  <lolo@phpheaven.net>
     * config.inc.php3; db_details_links.php3; db_search.php3;
-      Documentation.html; lang/*: patch #554925 - Search into database, thanks
-      to Thomas Chaumeny <chaume92 at aol.com>.
+      Documentation.html; lang/*; libraries/common.lib.php3: patch #554925
+      - Search into database, thanks to Thomas Chaumeny <chaume92 at aol.com>.
 
 2002-05-23 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, config.inc.php3, db_details_structure.php3,
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index e2bb319e7..5647dc277 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -91,6 +91,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
     if (!isset($cfg)) {
         include('./config_import.inc.php3');
     }
+    if (!isset($cfg['UseDbSearch'])) {
+        $cfg['UseDbSearch'] = TRUE;
+    }
 
     // If zlib output compression is set in the php configuration file, no
     // output buffering should be run