diff --git a/ChangeLog b/ChangeLog
index accd2fdd3b..c50b7ae5bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
 - issue #12279 Fixed error reporting on connect problems
 - issue #12290 Fixed export of tables without explicitly set engine
 - issue #12285 Designer JavaScript error: Show/Hide tables list
+- issue #12293 Fix MySQL SSL connection with some PHP versions
 
 4.6.2 (2016-05-25)
 - issue        [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14
diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index 2786884701..ec5e7b23a6 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -149,6 +149,7 @@ class DBIMysqli implements DBIExtension
 
         /* Optionally enable SSL */
         if ($cfg['Server']['ssl']) {
+            $client_flags |= MYSQLI_CLIENT_SSL;
             mysqli_ssl_set(
                 $link,
                 $cfg['Server']['ssl_key'],