diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c9b6de9dc..db002c207e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Tue Nov  2 16:28:34 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* breakpoint.c (insert_breakpoints, delete_breakpoint): Call
+	target_terminal_ours_for_output before attempting output.
+
+	* fork-child.c (fork_inferior): Fix comment so that it suggests
+	"set shell" rather than having "set env SHELL" affect GDB's
+	operation.
+
 Tue Nov  2 13:42:30 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* findvar.c (value_of_register, value_from_register),
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 1529516c5e..9fc11310fe 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -75,8 +75,8 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun)
   /* The user might want tilde-expansion, and in general probably wants
      the program to behave the same way as if run from
      his/her favorite shell.  So we let the shell run it for us.
-     FIXME, this should probably search the local environment (as
-     modified by the setenv command), not the env gdb inherited.  */
+     FIXME-maybe, we might want a "set shell" command so the user can change
+     the shell from within GDB.  */
   shell_file = getenv ("SHELL");
   if (shell_file == NULL)
     shell_file = default_shell_file;