diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 153f6cd7df6..27aa3941a69 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-12  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* linux-nat.c (linux_nat_can_async_p): Update comment.
+
 2017-01-12  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* serial.c (serial_open): Forget about "pc" and "lpt" serial interface.
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index dd5c6d2c4da..c58ed83efd0 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4417,9 +4417,8 @@ linux_nat_is_async_p (struct target_ops *ops)
 static int
 linux_nat_can_async_p (struct target_ops *ops)
 {
-  /* NOTE: palves 2008-03-21: We're only async when the user requests
-     it explicitly with the "set target-async" command.
-     Someday, linux will always be async.  */
+  /* We're always async, unless the user explicitly prevented it with the
+     "maint set target-async" command.  */
   return target_async_permitted;
 }