diff --git a/ChangeLog b/ChangeLog
index 787c78ea65..28e15fdc4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 
 4.3.11.0 (not yet released)
 - bug #4774 SQL links are completely wrong
+- bug #4768 MariaDB: version mismatch
 
 4.3.10.0 (2015-02-20)
 - bug       Undefined index navwork
diff --git a/index.php b/index.php
index 3c349a1373..ca264085d5 100644
--- a/index.php
+++ b/index.php
@@ -573,6 +573,8 @@ if ($server > 0) {
  * If no default server is set, $GLOBALS['dbi'] is not defined yet.
  * Drizzle can speak MySQL protocol, so don't warn about version mismatch for
  * Drizzle servers.
+ * We also do not warn if MariaDB is detected, as it has its own version
+ * numbering.
  */
 if (isset($GLOBALS['dbi'])
     && !PMA_DRIZZLE
@@ -584,6 +586,7 @@ if (isset($GLOBALS['dbi'])
     $_client_info = $GLOBALS['dbi']->getClientInfo();
     if ($server > 0
         && /*overload*/mb_strpos($_client_info, 'mysqlnd') === false
+        && /*overload*/mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') === false
         && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(
             PMA_MYSQL_INT_VERSION, 0, 3
         )