diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 32ff55c958..6ec60ae929 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* maint.c (_initialize_maint_cmds): Fix prefix of maint set/show
+	per-command.
+
 2018-02-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* dwarf2read.c (dwarf2_release_queue): Delete function, move body
diff --git a/gdb/maint.c b/gdb/maint.c
index 70e00110e5..a8a1fcbc29 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -1046,12 +1046,12 @@ This command has been moved to \"demangle\"."),
 
   add_prefix_cmd ("per-command", class_maintenance, set_per_command_cmd, _("\
 Per-command statistics settings."),
-		    &per_command_setlist, "set per-command ",
+		    &per_command_setlist, "maintenance set per-command ",
 		    1/*allow-unknown*/, &maintenance_set_cmdlist);
 
   add_prefix_cmd ("per-command", class_maintenance, show_per_command_cmd, _("\
 Show per-command statistics settings."),
-		    &per_command_showlist, "show per-command ",
+		    &per_command_showlist, "maintenance show per-command ",
 		    0/*allow-unknown*/, &maintenance_show_cmdlist);
 
   add_setshow_boolean_cmd ("time", class_maintenance,