diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59cc5c5dda..cf4d2c0c53 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  Pedro Alves  <pedro@codesourcery.com>
+
+	* infrun.c (handle_inferior_event): Set stop_print_frame on
+	TARGET_WAITKIND_LOADED events, if stopping on solib-events.
+
 2009-11-13  Doug Evans  <dje@google.com>
 
 	* dcache.c (dcache_block): Replace member newer with next,prev.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 842ff6b52e..9d8ab68cfa 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2821,6 +2821,10 @@ handle_inferior_event (struct execution_control_state *ecs)
 	     dynamically loaded objects (among other things).  */
 	  if (stop_on_solib_events)
 	    {
+	      /* Make sure we print "Stopped due to solib-event" in
+		 normal_stop.  */
+	      stop_print_frame = 1;
+
 	      stop_stepping (ecs);
 	      return;
 	    }