diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 86ca7367d69..6330c03236b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-30  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (linux_resume): Wake up the event loop before
+	returning.
+
 2015-11-30  Pedro Alves  <palves@redhat.com>
 
 	* mem-break.c (check_gdb_bp_preconditions): Remove current_thread
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 28abe418da4..086b202d944 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -4770,6 +4770,11 @@ linux_resume (struct thread_resume *resume_info, size_t n)
       debug_printf ("linux_resume done\n");
       debug_exit ();
     }
+
+  /* We may have events that were pending that can/should be sent to
+     the client now.  Trigger a linux_wait call.  */
+  if (target_is_async_p ())
+    async_file_mark ();
 }
 
 /* This function is called once per thread.  We check the thread's