diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81ba17a7beb..d01455f10cd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-18  Markus Metzger  <markus.t.metzger@intel.com>
+
+	* record-btrace.c (record_btrace_wait): Replace non_stop check with
+	target_is_non_stop_p ().
+
 2015-09-15  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* ada-typeprint.c (print_array_type): Do not describe arrays as
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 9e16ab412df..2d8b20bf963 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -2104,7 +2104,7 @@ record_btrace_wait (struct target_ops *ops, ptid_t ptid,
   *status = record_btrace_step_thread (tp);
 
   /* Stop all other threads. */
-  if (!non_stop)
+  if (!target_is_non_stop_p ())
     ALL_NON_EXITED_THREADS (other)
       other->btrace.flags &= ~BTHR_MOVE;