diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 27aa3941a69..bf0930fa62f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-12  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* remote.c (remote_can_async_p): Update comment.
+
 2017-01-12  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* linux-nat.c (linux_nat_can_async_p): Update comment.
diff --git a/gdb/remote.c b/gdb/remote.c
index 837b9ee5124..c73c30aacdf 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -13653,8 +13653,9 @@ remote_can_async_p (struct target_ops *ops)
 {
   struct remote_state *rs = get_remote_state ();
 
+  /* We don't go async if the user has explicitly prevented it with the
+     "maint set target-async" command.  */
   if (!target_async_permitted)
-    /* We only enable async when the user specifically asks for it.  */
     return 0;
 
   /* We're async whenever the serial device is.  */