diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8ebd0981b..cb5cefc0ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-20  Pedro Alves  <pedro@codesourcery.com>
+
+	* infrun.c (proceed): Switch the inferior event loop to
+	INF_EXEC_COMPLETE if the target refused to resume from a
+	vfork/fork.
+
 2011-05-20  Pedro Alves  <pedro@codesourcery.com>
 
 	* infcmd.c: Include "inf-loop.h".
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 7b9245c4bf..dac8b0d90d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2066,6 +2066,8 @@ proceed (CORE_ADDR addr, enum target_signal siggnal, int step)
     {
       /* The target for some reason decided not to resume.  */
       normal_stop ();
+      if (target_can_async_p ())
+	inferior_event_handler (INF_EXEC_COMPLETE, NULL);
       return;
     }