diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index c984e50962..e5b2fa4520 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -925,6 +925,14 @@ class WP_Rewrite {
 
 		$rules .= "</IfModule>\n";
 
+		// If ModSecurity is loaded, disable it for uploads.
+		$rules .= "\n<IfModule mod_security.c>\n" .
+			"<Files async-upload.php>\n" .
+			"SecFilterEngine Off\n" .
+			"SecFilterScanPOST Off\n" .
+			"</Files>\n" .
+			"</IfModule>\n";
+
 		$rules = apply_filters('mod_rewrite_rules', $rules);
 		$rules = apply_filters('rewrite_rules', $rules);  // Deprecated
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d2e309b0a3..e4b82a9bae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,6 +16,6 @@ $wp_version = '2.5-RC2';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 7499;
+$wp_db_version = 7558;
 
 ?>