diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e10e86d93..f37281929 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  3 09:01:14 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Set
+	length field correctly when "need_nl".
+
 Wed Aug  2 22:58:07 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* fork.cc (vfork): Store complete stack frame in vfork_save structure
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index a6eaefb6d..275ce4d68 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -233,6 +233,7 @@ fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on
 	 don't check again here.  */
       buf[0] = '\n';
       need_nl = 0;
+      rc = 1;
       goto out;
     }