diff --git a/wp-settings.php b/wp-settings.php
index dcaddda22..168d2f7e8 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -201,7 +201,12 @@ timer_start();
 if (defined('WP_DEBUG') and WP_DEBUG == true) {
 	error_reporting(E_ALL);
 } else {
-	error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
+	if ( defined( 'E_DEPRECATED' ) )
+		error_reporting(E_ALL ^ E_STRICT ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE);
+	else if ( defined( 'E_STRICT' ) )
+		error_reporting(E_ALL ^ E_STRICT ^ E_NOTICE ^ E_USER_NOTICE);
+	else
+		error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
 }
 
 // When this is defined and set to true the non-minified versions of the Javascripts will be used.