diff --git a/ChangeLog b/ChangeLog
index 1309bd607..b4a324396 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ $Source$
 2006-08-22 Marc Delisle  <lem9@users.sourceforge.net>
     * scripts/setup.php: bug #1536112, better fix (in case of 
       register_globals enabled), thanks to Michal
+    ### 2.8.2.3 released from MAINT_2_8_2
+    * scripts/setup.php: bug #1544692, version 2.8.2.3 breaks setup.php
+      on a server with register_globals enabled, thanks to Juergen Windkiel
+    ### 2.8.2.4 released from MAINT_2_8_2
 
 2006-08-21 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php, libraries/auth/cookie.auth.lib.php:
diff --git a/scripts/setup.php b/scripts/setup.php
index 79709a516..c5f724e8a 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -1808,7 +1808,7 @@ switch ($action) {
             break;
         }
 
-        $version_local = version_to_int( $GLOBALS['PMA_Config']->get('PMA_VERSION') );
+        $version_local = version_to_int( $PMA_Config_Setup->get('PMA_VERSION') );
         if ($version_local === FALSE) {
             message('error', 'Unparsable version string.');
             break;
@@ -1833,7 +1833,7 @@ switch ($action) {
     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#config">documentation</a> to see full description of all configuration directives.', 'Welcome');
 
-        if ( $GLOBALS['PMA_Config']->get( 'PMA_PHP_INT_VERSION' ) < 40100) {
+        if ( $PMA_Config_Setup->get( 'PMA_PHP_INT_VERSION' ) < 40100) {
             message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.', 'Too old PHP');
         }