diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index 52fe8855..6487b16f 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -81,6 +81,14 @@ function check_php_pdo_mysql()
     return class_exists('PDO') ? in_array('mysql', PDO::getAvailableDrivers()) : false;
 }
 
+function check_mbstring_func_overload()
+{
+    if ( ini_get('mbstring.func_overload') > 0) {
+        return false;
+    }
+    return true;
+}
+
 /**
  * check_config_values
  * checks to make sure that they have at least set the needed variables
diff --git a/templates/show_test_table.inc.php b/templates/show_test_table.inc.php
index b306b691..a3a65080 100644
--- a/templates/show_test_table.inc.php
+++ b/templates/show_test_table.inc.php
@@ -164,6 +164,21 @@
     <?php echo T_('This tests whether Ampache can manage large files (> 2GB). This is not strictly necessary, but may result in a better experience. This generally requires 64-bit operating system.'); ?>
     </td>
 </tr>
+<tr>
+    <td valign="top"><?php echo T_('PHP mbstring.func_overload'); ?></td>
+    <td valign="top">
+    <?php echo debug_result(check_mbstring_func_overload()); ?>
+    </td>
+    <td>
+    <?php printf(T_('This tests whether PHP %s is set as it may break the ID3 tag support.'), '<a href="http://php.net/manual/en/mbstring.overload.php">mbstring.func_overload</a>'); ?>
+    <?php
+    if (!check_mbstring_func_overload()) {
+        echo "<br />";
+        echo T_('Enabling Ampache ID3 tag write support along with mbstring.func_overload may result in irreversible corruption of your music files.\n\nYOU HAVE BEEN WARNED!');
+    }
+    ?>
+    </td>
+</tr>
 <?php
 if (!defined('INSTALL')) {
     ?>