diff --git a/CHANGES b/CHANGES
index e715676c..ef868af1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
+
 15 Oct 2007 - 2.1.4-rc1
 -----------------------
 
  * Do not process subrequests in phase 2-4.
 
+ * Fix a blocking FP in the multipart parser, which affected Safari.
+
 
 11 Sep 2007 - 2.1.3
 -------------------
diff --git a/apache2/msc_multipart.c b/apache2/msc_multipart.c
index b935c13e..316e8b70 100644
--- a/apache2/msc_multipart.c
+++ b/apache2/msc_multipart.c
@@ -603,8 +603,11 @@ static int multipart_count_boundary_params(apr_pool_t *mp, const char *header_va
 
     s = duplicate;
     while((s = strstr(s, "boundary")) != NULL) {
-        count++;
         s += 8;
+
+        if (strchr(s, '=') != NULL) {
+            count++;
+        }
     }
 
     return count;