diff --git a/ChangeLog b/ChangeLog
index 45c7469672..8adb8910d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep  8 07:13:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/net/telnet.rb: waitfor(): improvement. thanks to
+	  nobu.nakada@nifty.ne.jp
+
 Fri Sep  7 09:44:44 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
 	* lib/net/telnet.rb: waitfor(): bug fix.
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 0a520eaabb..91c4faedbe 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -467,8 +467,8 @@ module Net
         begin
           c = @sock.sysread(1024 * 1024)
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          c = rest + c
           if @options["Telnetmode"]
+            c = rest + c
             if Integer(c.rindex(/#{IAC}#{SE}/no)) <
                Integer(c.rindex(/#{IAC}#{SB}/no))
               buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])