diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 364d1e34d7..6130f0e1a1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-26  Andrew Cagney  <cagney@gnu.org>
+
+	Problem reported by Ashley Pittman <ashley@quadrics.com>.
+	* main.c (captured_main): When in batch mode always detach.
+
 2004-07-26  Andrew Cagney  <cagney@gnu.org>
 
 	* MAINTAINERS: Mark the xstormy16, sh64, ns32k, mn10300, mcore,
diff --git a/gdb/main.c b/gdb/main.c
index 4e5fd2a02f..0042962c5d 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -729,6 +729,13 @@ extern int gdbtk_test (char *);
 
   if (batch)
     {
+      if (attach_flag)
+	/* Either there was a problem executing the command in the
+	   batch file aborted early, or the batch file forgot to do an
+	   explicit detach.  Explicitly detach the inferior ensuring
+	   that there are no zombies.  */
+	target_detach (NULL, 0);
+      
       /* We have hit the end of the batch file.  */
       exit (0);
     }