diff --git a/ChangeLog b/ChangeLog
index 87a809afa9..e575410175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 11 21:00:59 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: Digest string wrongly included '\n' when user
+	  name is too long (ruby-bugs-ja:PR#404).
+
 Tue Mar 11 20:07:01 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/http.rb: speeding up by avoiding extra flush.
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 4b70f9e11a..89740411bd 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -2,7 +2,8 @@
 
 = net/smtp.rb
 
-Copyright (c) 1999-2002 Yukihiro Matsumoto
+Copyright (c) 1999-2003 Yukihiro Matsumoto
+Copyright (c) 1999-2003 Minero Aoki
 
 written & maintained by Minero Aoki <aamine@loveruby.net>
 
@@ -362,7 +363,7 @@ module Net
           tmp = Digest::MD5.digest(isecret + challenge)
           tmp = Digest::MD5.hexdigest(osecret + tmp)
 
-          getok [user + ' ' + tmp].pack('m').chomp
+          getok [user + ' ' + tmp].pack('m').gsub(/\s+/, '')
       }
     end