diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5fea4190c8..99de17fb84 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 22 13:12:33 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* remote-nindy.c (nindy_wait): Change timeout in SERIAL_READCHAR.
+
 Wed Jun 21 13:24:41 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* hppam3-nat.c: Change HP800_THREAD_STATE to TRACE_FLAVOR and
diff --git a/gdb/remote-nindy.c b/gdb/remote-nindy.c
index 7876d5bfb6..0fcaf2fce6 100644
--- a/gdb/remote-nindy.c
+++ b/gdb/remote-nindy.c
@@ -359,14 +359,14 @@ nindy_wait( pid, status )
   while (1)
     {
 	  /* Input on remote */
-	  c = SERIAL_READCHAR (nindy_serial, 0);
+	  c = SERIAL_READCHAR (nindy_serial, -1);
 	  if (c == SERIAL_ERROR)
 	    {
 	      error ("Cannot read from serial line");
 	    }
 	  else if (c == 0x1b) /* ESC */
 	    {
-	      c = SERIAL_READCHAR (nindy_serial, 0);
+	      c = SERIAL_READCHAR (nindy_serial, 1);
 	      c &= ~0x40;
 	    } 
 	  else if (c != 0x10) /* DLE */