diff --git a/ChangeLog b/ChangeLog
index 013af27de..59939cddc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-01-01 Michal Čihař  <michal@cihar.com>
+    * libraries/Config.class.php: Do not check permissions on Windows, it
+      seems to be broken anyway.
+
 2006-01-01 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/transformations.lib.php: remove some PHP3 compatibility code
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index db874e124..ef96e2cce 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -424,10 +424,14 @@ class PMA_Config
         }
 
         // Check for permissions (on platforms that support it):
-        $perms = @stat($this->getSource());
-        if (!($perms === false) && ($perms['mode'] & 2)) {
-            $this->source_mtime = 0;
-            die('Wrong permissions on configuration file, should not be world writable!');
+        $perms = @fileperms($this->getSource());
+        if (!($perms === false) && ($perms & 2)) {
+            // This check is normally done after loading configuration
+            $this->checkWebServerOs();
+            if ($this->get('PMA_IS_WINDOWS') == 0) {
+                $this->source_mtime = 0;
+                die('Wrong permissions on configuration file, should not be world writable!');
+            }
         }
 
         return true;