diff --git a/ChangeLog b/ChangeLog
index 806cd62016..5907e05744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
 + Patch #3507111 Display distinct results, linked to corresponding data rows
 - bug #3507917 [export] JSON has unescaped values for allegedly numeric columns
 + rfe #3516187 show tables creation, last update, last check timestamps in db_structure
+- bug #3059806 Supporting running from CIFS/Samba shares
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 7a4379f0e7..6dfc2760c1 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -716,13 +716,22 @@ class PMA_Config
         }
 
         if (! is_readable($this->getSource())) {
-            $this->source_mtime = 0;
-            die(
-                sprintf(
-                    __('Existing configuration file (%s) is not readable.'),
-                    $this->getSource()
-                )
-            );
+            // manually check if file is readable
+            // might be bug #3059806 Supporting running from CIFS/Samba shares
+            try {
+                $handle = @fopen($this->getSource(), 'r');
+                $contents = @fread($handle, @filesize($this->getSource()));
+                @fclose($handle);
+            }
+            catch (Exception $e) {
+                $this->source_mtime = 0;
+                die(
+                    sprintf(
+                        __('Existing configuration file (%s) is not readable.'),
+                        $this->getSource()
+                    )
+                );
+            }
         }
 
         return true;