diff --git a/ChangeLog b/ChangeLog
index 9ea6b65b4d..b882383485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct  4 22:16:29 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/cookie.rb: add default value to @@accept_charset
+	  if have not defined. [ruby-dev:38987]
+
+	* lib/cgi/util.rb: ditto.
+
 Sun Oct  4 19:30:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (struct {dump,load}_arg): manage with dfree, instead
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
index 98cb85d928..513bd40989 100644
--- a/lib/cgi/cookie.rb
+++ b/lib/cgi/cookie.rb
@@ -32,6 +32,7 @@
 #   cookie1.expires = Time.now + 30
 #   cookie1.secure  = true
 class CGI
+  @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   class Cookie < Array
 
     # Create a new CGI::Cookie object.
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index 218bdbdd9a..fbba00b963 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -1,4 +1,5 @@
 class CGI
+  @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   # URL-encode a string.
   #   url_encoded_string = CGI::escape("'Stop!' said Fred")
   #      # => "%27Stop%21%27+said+Fred"