diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e24ebc912..7f99b3e07e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  5 11:38:36 1995  Kung Hsu  <kung@rtl.cygnus.com>
+
+	* remote-nindy (nindy_wait): Use infinite timeout reading after
+	esacpe character.
+
 Tue Jul  4 10:30:22 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
 
 	* infrun.c (wait_for_inferior): When switching from one thread to
diff --git a/gdb/remote-nindy.c b/gdb/remote-nindy.c
index 1ced9cc969..3cdaf0c147 100644
--- a/gdb/remote-nindy.c
+++ b/gdb/remote-nindy.c
@@ -366,7 +366,7 @@ nindy_wait( pid, status )
 	    }
 	  else if (c == 0x1b) /* ESC */
 	    {
-	      c = SERIAL_READCHAR (nindy_serial, 1);
+	      c = SERIAL_READCHAR (nindy_serial, -1);
 	      c &= ~0x40;
 	    } 
 	  else if (c != 0x10) /* DLE */