diff --git a/ChangeLog b/ChangeLog
index 6f79cacdaf02..315ab197d13b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $HeadURL$
     * [too much files]: 
         - Rename tbl_* files to drop useless _properties part.
         - Rename db_* files to drop useless _details part.
+    * libraries/Config.class.php: Add backward compatibility code to affect
+      above renaming.
 
 2006-10-19 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php:
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 402ade25cdf0..36ffa251b6cd 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -383,6 +383,16 @@ function load($source = null)
             $this->source_mtime = filemtime($this->getSource());
         }
 
+        /**
+         * Backward compatibility code
+         */
+        if (!empty($cfg['DefaultTabTable'])) {
+            $cfg['DefaultTabTable'] = str_replace('_properties', '', str_replace('tbl_properties.php', 'tbl_sql.php', $cfg['DefaultTabTable']));
+        }
+        if (!empty($cfg['DefaultTabDatabase'])) {
+            $cfg['DefaultTabDatabase'] = str_replace('_details', '', str_replace('db_details.php', 'db_sql.php', $cfg['DefaultTabDatabase']));
+        }
+
         /**
          * @todo check validity of $_COOKIE['pma_collation_connection']
          */