diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 677970d2eb2..4b8a05f00f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Tomas Martinec  <fyzmat@gmail.com>
+
+	* infrun.c (handle_inferior_event) <handling deferred step>: Clear
+	trap_expected.
+
 2011-05-16  Doug Evans  <dje@google.com>
 
 	* python/py-auto-load.c (source_section_scripts): Mention objfile
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3b779de823c..0a15ea3f9b3 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3646,6 +3646,8 @@ handle_inferior_event (struct execution_control_state *ecs)
 	      singlestep_breakpoints_inserted_p = 0;
 	    }
 
+	  ecs->event_thread->control.trap_expected = 0;
+
 	  /* Note: We do not call context_switch at this point, as the
 	     context is already set up for stepping the original thread.  */
 	  switch_to_thread (deferred_step_ptid);