diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b6198421e4..434932cd4a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-21  Paul Brook  <paul@codesourcery.com>
+
+	* infrun.c (handle_inferior_event): Check stop_stack_dummy if handling
+	BPSTAT_WHAT_CHECK_SHLIBS.
+
 2004-01-21  Paul Brook  <paul@codesourcery.com>
 
 	* MAINTAINERS: Add myself to write-after-approval.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b10d65f76f..0724546ccf 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2301,7 +2301,7 @@ process_event_stop_test:
 	     gdb of events.  This allows the user to get control
 	     and place breakpoints in initializer routines for
 	     dynamically loaded objects (among other things).  */
-	  if (stop_on_solib_events)
+	  if (stop_on_solib_events || stop_stack_dummy)
 	    {
 	      stop_stepping (ecs);
 	      return;