diff --git a/ChangeLog b/ChangeLog
index d704d89b00..ef6a50e52d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,7 @@ phpMyAdmin - ChangeLog
 - issue #13053 Fixed broken links in setup
 - issue #12708 Removed phpMyAdmin version from User-Agent header
 - issue #13084 Do not point users to setup when it is disabled
+- issue #12660 Delete only phpMyAdmin cookies on upgrade
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index b0df7d9bee..3785c7f438 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -242,6 +242,10 @@ if (isset($_COOKIE)) {
     ) {
         // delete all cookies
         foreach ($_COOKIE as $cookie_name => $tmp) {
+            // We ignore cookies not with pma prefix
+            if (strncmp('pma', $cookie_name, 3) != 0) {
+                continue;
+            }
             $GLOBALS['PMA_Config']->removeCookie($cookie_name);
         }
         $_COOKIE = array();