diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ceeec1209b..85c8aaa26a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 17 06:54:50 1996  Mark Alexander  <marka@cygnus.com>
+
+	* mon960-rom.c: Shorten the mon960_inits string to a single
+	carriage return; this prevents a hang on connecting immediately
+	after powerup, when MON960 is attempting autobaud detection.
+
 Tue Jul 16 23:47:04 1996  Mark Alexander  <marka@cygnus.com>
 
 	* a29k-tdep.c (get_saved_register): Allow PC to be modified
diff --git a/gdb/mon960-rom.c b/gdb/mon960-rom.c
index fcec6a25da..0468a8b2cd 100644
--- a/gdb/mon960-rom.c
+++ b/gdb/mon960-rom.c
@@ -149,7 +149,7 @@ static char *mon960_regnames[NUM_REGS];
 
 /* need to pause the monitor for timing reasons, so slow it down */
 
-#if 1
+#if 0
 /* FIXME: this extremely long init string causes MON960 to return two NAKS
    instead of performing the autobaud recognition, at least when gdb
    is running on Linux.  The short string below works on Linux, and on