diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2511502a8..61d12051d9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-07  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* gnu-nat.c (set_sig_thread_cmd): Call global_thread_id_to_ptid
+	instead of thread_id_to_pid.
+
 2016-12-06  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* inferior.c (inferior_command): Remove duplicate
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 927ee5c6f1..92b9292428 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2964,7 +2964,7 @@ set_sig_thread_cmd (char *args, int from_tty)
     inf->signal_thread = 0;
   else
     {
-      ptid_t ptid = thread_id_to_pid (atoi (args));
+      ptid_t ptid = global_thread_id_to_ptid (atoi (args));
 
       if (ptid_equal (ptid, minus_one_ptid))
 	error (_("Thread ID %s not known.  "