diff --git a/ChangeLog b/ChangeLog
index 094812c3b5..6b9dc8f01b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  2 19:06:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+	  double quotes are allowed.  [ruby-list:45140]
+
 Wed Jul  2 19:03:37 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 e616534221..5279439a08 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1043,7 +1043,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
diff --git a/version.h b/version.h
index c8b5b3f3ac..8249a3eaa1 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8