diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index beb604f1eff..9edfd8d7b04 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-11  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* cli/cli-decode.c (add_info): Switch to class_info.
+
 2015-11-09  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.c (ada_is_wrapper_field): Add special handling
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index cab2336ff8f..948cba3a786 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -855,7 +855,7 @@ delete_cmd (const char *name, struct cmd_list_element **list,
 struct cmd_list_element *
 add_info (const char *name, cmd_cfunc_ftype *fun, const char *doc)
 {
-  return add_cmd (name, no_class, fun, doc, &infolist);
+  return add_cmd (name, class_info, fun, doc, &infolist);
 }
 
 /* Add an alias to the list of info subcommands.  */