diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 85b76fea34..638b8d97fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-21  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* top.c (quit_confirm): Warn that we will kill the program.
+
 2008-03-19  Pedro Alves  <pedro@codesourcery.com>
 
 	* inflow.c (terminal_ours_1): Guard access to
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 30fba7025f..3e5f867660 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-21  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.threads/killed.exp, gdb.threads/manythreads.exp,
+	gdb.threads/staticthreads.exp: Update exit query.
+
 2008-03-07  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* lib/gdb.exp (gdb_load_cmd): Fix $args typo in timeout error message.
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
index 167e060d55..9633dfbb8c 100644
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ b/gdb/testsuite/gdb.threads/killed.exp
@@ -87,7 +87,7 @@ gdb_expect {
 # Try to quit.
 send_gdb "quit\n"
 gdb_expect {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
+    -re "The program is running.  Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
         send_gdb "y\n"
         exp_continue
     }
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index 182aa6fdb5..a92d049b63 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -133,7 +133,7 @@ gdb_test_multiple "" "stop threads 2" {
 } 
 
 gdb_test_multiple "quit" "GDB exits after stopping multithreaded program" {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
+    -re "The program is running.  Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
 	send_gdb "y\n"
 	exp_continue
     }
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index 95b8d24f23..6453e0b6fe 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -91,7 +91,7 @@ gdb_test_multiple "info threads" "$test" {
 
 set test "GDB exits with static thread program"
 gdb_test_multiple "quit" "$test" {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
+    -re "The program is running.  Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
 	send_gdb "y\n"
 	exp_continue
     }
diff --git a/gdb/top.c b/gdb/top.c
index 379f0b72b5..418ff8e95f 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1253,7 +1253,7 @@ quit_confirm (void)
       else if (attach_flag)
 	s = "The program is running.  Quit anyway (and detach it)? ";
       else
-	s = "The program is running.  Exit anyway? ";
+	s = "The program is running.  Quit anyway (and kill it)? ";
 
       if (!query ("%s", s))
 	return 0;