diff --git a/Documentation.html b/Documentation.html
index cf42a566ec..9999f0eada 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -624,6 +624,12 @@ since this link provides funding for phpMyAdmin.
     You can set this parameter to <code>TRUE</code> to stop this message
     from appearing.</dd>
 
+    <dt id="cfg_ServerLibraryDifference_DisableWarning">$cfg['ServerLibraryDifference_DisableWarning'] boolean</dt>
+    <dd>A warning is displayed on the main page if there is a difference 
+    between the MySQL library and server version.
+    You can set this parameter to <code>TRUE</code> to stop this message 
+    from appearing.</dd>
+
     <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt>
     <dd>Show warning about incomplete translations on certain threshold.</dd>
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 8feac75a61..a12f8fb2b2 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -61,6 +61,14 @@ $cfg['SuhosinDisableWarning'] = false;
  */
 $cfg['McryptDisableWarning'] = false;
 
+/**
+ * Disable the default warning that is displayed if a diffrence between 
+ * the MySQL library and server is detected.
+ *
+ * @global boolean $cfg['['ServerLibraryDifference_DisableWarning']']
+ */
+$cfg['ServerLibraryDifference_DisableWarning'] = false;
+
 /**
  * Show warning about incomplete translations on certain threshold.
  *
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index d3203574b4..f2a9cfca58 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -336,6 +336,8 @@ $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL d
 $strConfigPersistentConnections_name = __('Persistent connections');
 $strConfigPmaNoRelation_DisableWarning_desc = __('Disable the default warning that is displayed on the database details Structure page if any of the required tables for the phpMyAdmin configuration storage could not be found');
 $strConfigPmaNoRelation_DisableWarning_name = __('Missing phpMyAdmin configuration storage tables');
+$strConfigServerLibraryDifference_DisableWarning_desc = __('Disable the default warning that is displayed if a diffrence between the MySQL library and server is detected');
+$strConfigServerLibraryDifference_DisableWarning_name = __('Server/library diffrence warning');
 $strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
 $strConfigPropertiesIconic_name = __('Iconic table operations');
 $strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 47757485ee..70a99a64b4 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -114,6 +114,7 @@ $forms['Features']['Page_titles'] = array(
     'TitleDatabase',
     'TitleServer');
 $forms['Features']['Warnings'] = array(
+    'ServerLibraryDifference_DisableWarning',
     'PmaNoRelation_DisableWarning',
     'SuhosinDisableWarning',
     'McryptDisableWarning');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 1383d6355b..72322eb9bc 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -49,6 +49,7 @@ $forms['Features']['Page_titles'] = array(
     'TitleDatabase',
     'TitleServer');
 $forms['Features']['Warnings'] = array(
+    'ServerLibraryDifference_DisableWarning',
     'PmaNoRelation_DisableWarning',
     'SuhosinDisableWarning',
     'McryptDisableWarning');
diff --git a/main.php b/main.php
index f891950f13..bc25f16e53 100644
--- a/main.php
+++ b/main.php
@@ -454,7 +454,9 @@ if ($server > 0) {
  * Drizzle can speak MySQL protocol, so don't warn about version mismatch for
  * Drizzle servers.
  */
-if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
+if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE 
+        && $cfg['ServerLibraryDiffrence_DisableWarning'] == false
+    ) {
     $_client_info = PMA_DBI_get_client_info();
     if ($server > 0
         && strpos($_client_info, 'mysqlnd') === false