diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 787ee0d60a..84456114c6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-12-11  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* infrun.h (debug_infrun): Make a bool.
+	* infrun.c (debug_infrun): Make a bool.
+	(_initialize_infrun): Use add_setshow_boolean_cmd to define "set
+	debug infrun".
+
 2020-12-11  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* displaced-stepping.h (displaced_debug_printf): Use
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 793a7d2bad..f509481e3d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -153,7 +153,7 @@ static ptid_t previous_inferior_ptid;
 
 static bool detach_fork = true;
 
-unsigned int debug_infrun = 0;
+bool debug_infrun = false;
 static void
 show_debug_infrun (struct ui_file *file, int from_tty,
 		   struct cmd_list_element *c, const char *value)
@@ -9214,13 +9214,12 @@ There is no `stop' command, but you can set a hook on `stop'.\n\
 This allows you to set a list of commands to be run each time execution\n\
 of the program stops."), &cmdlist);
 
-  add_setshow_zuinteger_cmd ("infrun", class_maintenance, &debug_infrun, _("\
-Set inferior debugging."), _("\
-Show inferior debugging."), _("\
-When non-zero, inferior specific debugging is enabled."),
-			     NULL,
-			     show_debug_infrun,
-			     &setdebuglist, &showdebuglist);
+  add_setshow_boolean_cmd
+    ("infrun", class_maintenance, &debug_infrun,
+     _("Set inferior debugging."),
+     _("Show inferior debugging."),
+     _("When non-zero, inferior specific debugging is enabled."),
+     NULL, show_debug_infrun, &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("non-stop", no_class,
 			   &non_stop_1, _("\
diff --git a/gdb/infrun.h b/gdb/infrun.h
index 4a4db84baa..3b5ab75175 100644
--- a/gdb/infrun.h
+++ b/gdb/infrun.h
@@ -29,7 +29,7 @@ struct process_stratum_target;
 struct thread_info;
 
 /* True if we are debugging run control.  */
-extern unsigned int debug_infrun;
+extern bool debug_infrun;
 
 /* Print an "infrun" debug statement.  */