diff --git a/ChangeLog b/ChangeLog
index 58cad8425..bc0745866 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-28 Michal Čihař  <michal@cihar.com>
+    * scripts/setup.php: Don't allow loading of configuration if there is no
+      write permission on config.
+
 2005-11-28 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/Theme.class.php, libraries/Theme_Manager.class.php:
       new classes for handling themes
diff --git a/scripts/setup.php b/scripts/setup.php
index 08e8864cb..dd06b6691 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -879,6 +879,10 @@ switch ($action) {
         fclose($config);
         break;
     case 'load':
+        if ($fail_dir) {
+            message('error', 'Reading of configuration disabled because of permissions.');
+            break;
+        } 
         $bck_cfg = $cfg;
         unset($cfg);
         $config_file = '../config/config.inc.php';