diff --git a/check_setup.php b/check_setup.php
index 67a160c..26afe38 100644
--- a/check_setup.php
+++ b/check_setup.php
@@ -5,11 +5,17 @@ if (version_compare(PHP_VERSION, '5.3.7', '<')) {
     die('This software require PHP 5.3.7 minimum');
 }
 
-// Short tags must be enabled for PHP < 5.4
+// Checks for PHP < 5.4
 if (version_compare(PHP_VERSION, '5.4.0', '<')) {
 
+    // Short tags must be enabled for PHP < 5.4
     if (! ini_get('short_open_tag')) {
-        die('This software require to have short tags enabled, check your php.ini => "short_open_tag = On"');
+        die('This software require to have short tags enabled if you have PHP < 5.4 ("short_open_tag = On")');
+    }
+
+    // Magic quotes are deprecated since PHP 5.4
+    if (get_magic_quotes_gpc()) {
+        die('This software require to have "Magic quotes" disabled, it\'s deprecated since PHP 5.4 ("magic_quotes_gpc = Off")');
     }
 }
 
@@ -36,6 +42,11 @@ if (! extension_loaded('pdo_sqlite')) {
     die('PHP extension required: pdo_sqlite');
 }
 
+// Check extension: mbstring
+if (! extension_loaded('mbstring')) {
+    die('PHP extension required: mbstring');
+}
+
 // Check for curl
 if (! function_exists('curl_init') && ! ini_get('allow_url_fopen')) {
     die('You must have "allow_url_fopen=On" or curl extension installed');