diff --git a/ChangeLog b/ChangeLog
index 8663949126..d49d6ad2dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Wed Aug  7 21:58:01 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+Wed Aug  7 22:12:54 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* optparse.rb (OptionParser::Completion::convert): returned all
 	  values not first one.
@@ -7,6 +7,8 @@ Wed Aug  7 21:58:01 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* optparse.rb (OptionParser::order): ditto.
 
+	* lib/optparse/time.rb: prior time.rb.
+
 	* lib/optparse/uri.rb: require standard uri module.  thanks to
 	  Minero Aoki.
 
diff --git a/lib/optparse/time.rb b/lib/optparse/time.rb
index 5e54b709e0..9f677a8d31 100644
--- a/lib/optparse/time.rb
+++ b/lib/optparse/time.rb
@@ -1,9 +1,9 @@
 require 'optparse'
-require 'parsedate'
+require 'time'
 
 OptionParser.accept(Time) do |s|
   begin
-    Time::mktime(*ParseDate::parsedate(s)[0...6])
+    (Time.httpdate(s) rescue Time.parse(s)) if s
   rescue
     raise OptionParser::InvalidArgument, s
   end