diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5af19b36a5..5f0cb6c8be 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-15  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* lib/gdb.exp (gdb_unload): Add another termination case.
+
 2011-03-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.dwarf2/dw2-empty-pc-range.S: New file.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 1b601afc63..6a2f1a2206 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -137,9 +137,8 @@ proc gdb_unload {} {
     gdb_expect 60 {
 	-re "No executable file now\[^\r\n\]*\[\r\n\]" { exp_continue }
 	-re "No symbol file now\[^\r\n\]*\[\r\n\]" { exp_continue }
-	-re "A program is being debugged already..*Kill it.*y or n. $"\
-	    { send_gdb "y\n"
-		verbose "\t\tKilling previous program being debugged"
+	-re "A program is being debugged already.*Are you sure you want to change the file.*y or n. $" {
+	    send_gdb "y\n"
 	    exp_continue
 	}
 	-re "Discard symbol table from .*y or n.*$" {