diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ad0e9350e7..3fe50fe176 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-20  Pedro Alves  <pedro@codesourcery.com>
+
+	* inf-loop.c (inferior_event_handler): Only output a message if
+	verbose.
+
 2011-05-20  Luis Machado  <lgustavo@codesourcery.com>
 
 	* MAINTAINERS: Update my e-mail address.
diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index ea5a2ed094..e347451dcc 100644
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -121,7 +121,8 @@ inferior_event_handler (enum inferior_event_type event_type,
       else
 	do_all_continuations ();
 
-      if (current_language != expected_language
+      if (info_verbose
+	  && current_language != expected_language
 	  && language_mode == language_mode_auto)
 	language_info (1);	/* Print what changed.  */