diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2974d7275c..71c61bc909 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2019-02-14  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* gnu-nat.c (gnu_nat_target::detach): Instead of
+	'detach_inferior (pid)' call
+	'detach_inferior (find_inferior_pid (pid))'.
+
 	* configure.nat [gdb_host == i386gnu] (NATDEPFILES): Add
 	'nat/fork-inferior.o'.
 	* gnu-nat.c: #include "nat/fork-inferior.h".
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 5a47cb7d63..67cc95c68d 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2279,7 +2279,7 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
   inf_detach (gnu_current_inf);
 
   inferior_ptid = null_ptid;
-  detach_inferior (pid);
+  detach_inferior (find_inferior_pid (pid));
 
   maybe_unpush_target ();
 }