diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 498451f7ba..c470487ec5 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -220,6 +220,7 @@ class PMA_Config
         ) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'CHROME');
+            // newer Safari
         } elseif (preg_match(
             '@Mozilla/([0-9].[0-9]{1,2})@',
             $HTTP_USER_AGENT,
@@ -230,6 +231,17 @@ class PMA_Config
                 'PMA_USR_BROWSER_VER', $log_version2[1]
             );
             $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
+            // older Safari
+        } elseif (preg_match(
+            '@Mozilla/([0-9].[0-9]{1,2})@',
+            $HTTP_USER_AGENT,
+            $log_version)
+            && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)
+        ) {
+            $this->set(
+                'PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]
+            );
+            $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
         } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
             $this->set('PMA_USR_BROWSER_VER', '1.9');
             $this->set('PMA_USR_BROWSER_AGENT', 'GECKO');
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 5783bde3b7..8be6507584 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -126,17 +126,12 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
                 'IE',
                 '8.0',
             ),
-            /**
-             * @todo Retest this one 
-             */
-            /*
             array(
                 'Mozilla/5.0 (Unknown; U; Unix BSD/SYSV system; C -) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.10.2',
                 'Unix',
                 'SAFARI',
                 '5.0.419',
             ),
-             */
             array(
                 'Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208',
                 'Win',