diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b4d0d23ae2..97bc5ddedf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-26  Jim Blandy  <jimb@codesourcery.com>
+
+	* remote.c (getpkt_sane): Fix error message.  No animals were
+	harmed in the making of this debugger.
+
 2007-09-26  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* p-typeprint.c: Fix 11 ARI reported problems.
diff --git a/gdb/remote.c b/gdb/remote.c
index b46fb1308e..309ee67550 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5029,7 +5029,7 @@ getpkt_sane (char **buf, long *sizeof_buf, int forever)
 		{
 		  QUIT;
 		  target_mourn_inferior ();
-		  error (_("Watchdog has expired.  Target detached."));
+		  error (_("Watchdog timeout has expired.  Target detached."));
 		}
 	      if (remote_debug)
 		fputs_filtered ("Timed out.\n", gdb_stdlog);