diff --git a/ChangeLog b/ChangeLog
index a57f4b40c..793221ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + rfe #2823707 [edit] Call UUID function separately to show it in insert.
 + rfe #2420684 [export] Allow export of timestamps in UTC.
 + [core] Remove config data from session as it brings chicken-egg problem.
++ [core] Cookie path now honors PmaAbsoluteUri.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c66caa7c8..05ce63604 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -874,38 +874,11 @@ class PMA_Config
             return $cookie_path;
         }
 
-        $url = '';
+        $this->checkPmaAbsoluteUri();
 
-        /**
-         * REQUEST_URI contains PATH_INFO too, this is not what we want
-         * script-php/pathinfo/
-        if (PMA_getenv('REQUEST_URI')) {
-            $url = PMA_getenv('REQUEST_URI');
-        }
-         */
+        $parsed_url = parse_url($this->get('PmaAbsoluteUri'));
 
-        // If we don't have path
-        if (empty($url)) {
-            if ($GLOBALS['PMA_PHP_SELF']) {
-                // PHP_SELF in CGI often points to cgi executable, so use it
-                // as last choice
-                $url = $GLOBALS['PMA_PHP_SELF'];
-            // on IIS with PHP-CGI:
-            } elseif (PMA_getenv('SCRIPT_NAME')) {
-                $url = PMA_getenv('SCRIPT_NAME');
-            }
-        }
-
-        /**
-         * REQUEST_URI contains PATH_INFO too, this is not what we want
-         * script-php/pathinfo/
-        $parsed_url = @parse_url($_SERVER['REQUEST_URI']); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/'
-        if ($parsed_url === false) {
-         */
-            $parsed_url = array('path' => $url);
-        //}
-
-        $cookie_path   = substr($parsed_url['path'], 0, strrpos($parsed_url['path'], '/'))  . '/';
+        $cookie_path   = $parsed_url['path'];
 
         return $cookie_path;
     }