diff --git a/ChangeLog b/ChangeLog
index 2d23a7c75b..13e9b2bbb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 31 02:44:06 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by
+	  Netscape bug.
+
 Tue Oct 30 18:21:51 2001  Usaku Nakamura <usa@ruby-lang.org>
 
 	* win32/mkexports.rb: follow the change of rb_io_puts().
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 7148e7ab03..97bbc994f0 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -698,9 +698,7 @@ convert string charset, and set language to "ja".
       name = CGI::unescape(name)
       values ||= ""
       values = values.split('&').collect{|v| CGI::unescape(v) }
-      if cookies.has_key?(name)
-        cookies[name].value.push(*values)
-      else
+      unless cookies.has_key?(name)
         cookies[name] = Cookie::new({ "name" => name, "value" => values })
       end
     end