diff --git a/ChangeLog b/ChangeLog
index 33e684f37d..f53d47d034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  1 01:07:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+	  double quotes are allowed.  [ruby-list:45140]
+
 Tue Jul  1 00:59:43 2008  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 538b33380d..b0c2ef92fe 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1040,7 +1040,7 @@ class CGI
 
         body.rewind
 
-        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"\s])*)"|([^;\s]*))/ni.match(head)
+        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni.match(head)
 	filename = ($1 or $2 or "")
 	if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
 	    /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and