diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f68cc6d6f8..14dcfbf0dd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-06  Daniel Jacobowitz  <dan@debian.org>
+
+	* linux-nat.c (child_follow_fork): Call target_terminal_ours before
+	printing output.  Use fprintf_unfiltered.  Only print output when
+	debugging.
+
 2005-03-05  Mark Kettenis  <kettenis@janacek.sibelius.xs4all.nl>
 
 	* sparc64-tdep.c (sparc64_store_floating_fields): Constify third
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 57843c53ad..faff62e7b1 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -359,9 +359,13 @@ child_follow_fork (int follow_child)
 	 also, but they'll be reinserted below.  */
       detach_breakpoints (child_pid);
 
-      fprintf_filtered (gdb_stdout,
-			"Detaching after fork from child process %d.\n",
-			child_pid);
+      if (debug_linux_nat)
+	{
+	  target_terminal_ours ();
+	  fprintf_unfiltered (gdb_stdlog,
+			      "Detaching after fork from child process %d.\n",
+			      child_pid);
+	}
 
       ptrace (PTRACE_DETACH, child_pid, 0, 0);
 
@@ -430,9 +434,13 @@ child_follow_fork (int follow_child)
       /* Before detaching from the parent, remove all breakpoints from it. */
       remove_breakpoints ();
 
-      fprintf_filtered (gdb_stdout,
-			"Attaching after fork to child process %d.\n",
-			child_pid);
+      if (debug_linux_nat)
+	{
+	  target_terminal_ours ();
+	  fprintf_unfiltered (gdb_stdlog,
+			      "Attaching after fork to child process %d.\n",
+			      child_pid);
+	}
 
       /* If we're vforking, we may want to hold on to the parent until
 	 the child exits or execs.  At exec time we can remove the old