diff --git a/ChangeLog b/ChangeLog
index 15e4c9c17c..133ce53022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May  4 15:21:18 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails.
+
 Sun May  4 15:06:37 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/pop.rb: APOP did not work.  [ruby-dev:20149]
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 276c979b20..71d368e084 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -302,7 +302,7 @@ module Net
 
     def start( helo = 'localhost.localdomain',
                user = nil, secret = nil, authtype = nil )
-      raise IOError, 'SMTP session opened already' if @started
+      raise IOError, 'SMTP session already started' if @started
       if block_given?
         begin
           do_start(helo, user, secret, authtype)
@@ -330,7 +330,7 @@ module Net
       rescue ProtocolError
         if @esmtp
           @esmtp = false
-          @command.error_ok
+          @command = SMTPCommand.new(@socket)
           retry
         end
         raise