diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c7c13b57f..ab18b40b44 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  Pedro Alves  <palves@redhat.com>
+
+	* linux-nat.c (linux_handle_extended_wait) <PTRACE_EVENT_EXEC>:
+	Set the LWP's 'resumed' flag.
+
 2015-01-09  Pedro Alves  <palves@redhat.com>
 
 	* linux-nat.c (linux_resume_one_lwp): New function.
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 2097cb92b7..e2601e0dee 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -2085,6 +2085,10 @@ linux_handle_extended_wait (struct lwp_info *lp, int status,
       ourstatus->value.execd_pathname
 	= xstrdup (linux_child_pid_to_exec_file (NULL, pid));
 
+      /* The thread that execed must have been resumed, but, when a
+	 thread execs, it changes its tid to the tgid, and the old
+	 tgid thread might have not been resumed.  */
+      lp->resumed = 1;
       return 0;
     }