diff --git a/ChangeLog b/ChangeLog
index 39615ede1..fbfb64059 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-04-10 Michal Čihař  <michal@cihar.com>
+    * libraries/Config.class.php: Check also default config mtime (bug
+      #1467620).
+
 2006-04-09 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_replace.php, libraries/dbi/mysqli.dbi.lib.php: bug #1255923,
       detect and report silent truncation (mysqli only)
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index dc6e3b71f..6bd60c2b6 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -27,6 +27,7 @@ class PMA_Config
      * @var int     source modification time
      */
     var $source_mtime = 0;
+    var $default_source_mtime = 0;
 
     /**
      * @var boolean
@@ -286,6 +287,7 @@ class PMA_Config
     function __wakeup()
     {
         if (file_exists($this->getSource()) && $this->source_mtime !== filemtime($this->getSource())
+          || $this->default_source_mtime !== filemtime($this->default_source)
           || $this->error_config_file || $this->error_config_default_file) {
             $this->settings = array();
             $this->load($this->getSource());
@@ -318,6 +320,8 @@ class PMA_Config
         }
         include $this->default_source;
 
+        $this->default_source_mtime = filemtime($this->default_source);
+
         $this->default_server = $cfg['Servers'][1];
         unset($cfg['Servers']);