diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6da544ea41..057c14f8cf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-22  John Baldwin  <jhb@FreeBSD.org>
+
+	* fbsd-nat.c (fbsd_pid_to_str): Adjust string format.
+
 2016-01-22  Yao Qi  <yao.qi@linaro.org>
 
 	* arm-linux-nat.c (fetch_fpregs): Call perror_with_name
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index e7ca0e6657..bdf078e6cc 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -303,7 +303,7 @@ fbsd_pid_to_str (struct target_ops *ops, ptid_t ptid)
       static char buf[64];
       int pid = ptid_get_pid (ptid);
 
-      xsnprintf (buf, sizeof buf, "process %d, LWP %d", pid, lwp);
+      xsnprintf (buf, sizeof buf, "LWP %d of process %d", lwp, pid);
       return buf;
     }