diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 90056a54eb..019d4416dc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* infrun.c (handle_inferior_event): Clear trap_expected after
+	stepping past a single-step breakpoint.
+
 2009-07-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* arm-tdep.c (enum arm_vfp_cprc_base_type,
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 631c1af191..f8179727df 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2813,6 +2813,7 @@ targets should add new threads to the thread list themselves in non-stop mode.")
 	  singlestep_breakpoints_inserted_p = 0;
 
 	  ecs->random_signal = 0;
+	  ecs->event_thread->trap_expected = 0;
 
 	  context_switch (saved_singlestep_ptid);
 	  if (deprecated_context_hook)