diff --git a/ChangeLog b/ChangeLog
index 6f3be94da..3baaaa2d2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ $Source$
         - Add links to documentation.
         - Document all functions.
         - Warn about missing mbstring and old PHP version.
+        - Display all warnings in one place.
     * libraries/auth/cookie.auth.lib.php: Display PMA_errors on login form.
     * Documentation.html: Add anchors to configuration directives.
     * libraries/sqlparser.lib.php: Do not use functions not supported by older
diff --git a/scripts/setup.php b/scripts/setup.php
index 46c9f95ba..339961c71 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -1029,10 +1029,6 @@ if ($action != 'download') {
     $config = @fopen('../config/config.inc.php', 'a');
     $fail_dir = $fail_dir || ($config === FALSE);
     @fclose($config);
-
-    if ($fail_dir) {
-        message('warning', 'Please create web server writable folder config in phpMyAdmin toplevel directory as described in <a href="../Documentation.html">documentation</a>. Otherwise you will be only able to download or display it.', 'Can not write configuration');
-    }
 }
 
 /**
@@ -1629,10 +1625,14 @@ switch ($action) {
         break;
 
     case '':
-        message('notice', 'You want to configure phpMyAdmin using web interface. Please note that this only allows basic setup, please read <a href="../Documentation.html">documentation</a> to see full description of all configuration directives.', 'Welcome');
+        message('notice', 'You want to configure phpMyAdmin using web interface. Please note that this only allows basic setup, please read <a href="../Documentation.html#config">documentation</a> to see full description of all configuration directives.', 'Welcome');
 
         if (PMA_PHP_INT_VERSION < 40100) {
-            message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.');
+            message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.', 'Too old PHP');
+        }
+
+        if ($fail_dir) {
+            message('warning', 'Please create web server writable folder config in phpMyAdmin toplevel directory as described in <a href="../Documentation.html#setup_script">documentation</a>. Otherwise you will be only able to download or display it.', 'Can not write configuration');
         }
 
         if (empty($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'off') {