diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35bd2acda7..5319ac2378 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-19  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* infrun.c (resume): If the thread is placed to the deferred step
+        queue, mark it as running.
+
 2008-08-19  Vladimir Prus  <vladimir@codesourcery.com>
 
 	Make sure target supports non-stop.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 19b3229abc..5d420043df 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -995,7 +995,11 @@ a command like `return' or `jump' to continue execution."));
 	{
 	  /* Got placed in displaced stepping queue.  Will be resumed
 	     later when all the currently queued displaced stepping
-	     requests finish.  */
+	     requests finish.  The thread is not executing at this point,
+	     and the call to set_executing will be made later.  But we
+	     need to call set_running here, since from frontend point of view,
+	     the thread is running.  */
+	  set_running (inferior_ptid, 1);
 	  discard_cleanups (old_cleanups);
 	  return;
 	}