diff --git a/ChangeLog b/ChangeLog
index 2c8486cd32..9bd49c261c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 18 04:37:51 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
+
 Sat Apr 14 13:37:32 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
 	* win32/config.status.in: no longer use missing/alloca.c.
@@ -239,17 +243,17 @@ Mon Mar 19 10:55:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sun Mar 18 08:58:18 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* lib/net/cgi.rb: // === '' --> //.match('')
+	* lib/cgi.rb: // === '' --> //.match('')
 
-	* lib/net/cgi.rb: cgi#header(): improvement for mod_ruby.
+	* lib/cgi.rb: cgi#header(): improvement for mod_ruby.
 
-	* lib/net/cgi.rb: cgi#rfc1123date(): improvement.
+	* lib/cgi.rb: cgi#rfc1123date(): improvement.
 	  thanks to TADA Tadashi <sho@spc.gr.jp>.
 
-	* lib/net/cgi.rb: cgi#rfc1123date(): document bug fix.
+	* lib/cgi.rb: cgi#rfc1123date(): document bug fix.
 	  thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
 
-	* lib/net/cgi.rb: cgi#header(): bug fix.
+	* lib/cgi.rb: cgi#header(): bug fix.
 	  thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
 
 Sat Mar 17 11:11:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
diff --git a/lib/cgi.rb b/lib/cgi.rb
index fcf8c006e5..cfbdab8686 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -185,10 +185,10 @@ class CGI
   CR  = "\015"
   LF  = "\012"
   EOL = CR + LF
-  VERSION = '2.1.3'
-  RELEASE_DATE = '2001-03-18'
+  VERSION = '2.1.4'
+  RELEASE_DATE = '2001-04-18'
   VERSION_CODE = 214
-  RELEASE_CODE = 20010318
+  RELEASE_CODE = 20010418
   REVISION = '$Id$'
 
   NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM)
@@ -643,13 +643,9 @@ convert string charset, and set language to "ja".
       # simple support for IE
       if options["path"]
         @path = options["path"]
-      elsif ENV["REQUEST_URI"]
-        @path = ENV["REQUEST_URI"].sub(/\?.*/n,'')
-        if ENV["PATH_INFO"]
-          @path = @path[0...@path.rindex(ENV["PATH_INFO"])]
-        end
       else
-        @path = (ENV["SCRIPT_NAME"] or "")
+        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+        @path = ($1 or "")
       end
       @domain = options["domain"]
       @expires = options["expires"]