diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e95bddf65..fab0c162e2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-06  Christopher Faylor  <cgf@cygnus.com>
+
+	* infcmd.c (attach_command): Move "stop_soon_quietly" setting
+	inside ATTACH_NO_WAIT conditional since we are not about to
+	stop soon if we're not calling wait_for_inferior.
+
 Wed Jul  5 21:06:39 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* config/i386/fbsd.mh (NATDEPFILES): Keep NATDEPFILES to a single
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index f00b0e3879..4f2dd8c985 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1721,11 +1721,11 @@ attach_command (args, from_tty)
      wait_for_inferior as soon as the target reports a stop.  */
   init_wait_for_inferior ();
   clear_proceed_status ();
-  stop_soon_quietly = 1;
 
   /* No traps are generated when attaching to inferior under Mach 3
      or GNU hurd.  */
 #ifndef ATTACH_NO_WAIT
+  stop_soon_quietly = 1;
   wait_for_inferior ();
 #endif