diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc3393a27f6..60e03e76198 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-11  Philipp Rudo  <prudo@linux.vnet.ibm.com>
+
+	* linux-nat.c (linux_nat_detach): Remove delete_lwp call.
+
 2017-04-11  Alan Hayward  <alan.hayward@arm.com>
 
 	* arm-tdep.c (arm_store_return_value): Use FP_REGISTER_SIZE
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index b06e400fdc2..8dececf2c52 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1549,7 +1549,6 @@ linux_nat_detach (struct target_ops *ops, const char *args, int from_tty)
 
       inf_ptrace_detach_success (ops);
     }
-  delete_lwp (main_lwp->ptid);
 }
 
 /* Resume execution of the inferior process.  If STEP is nonzero,