diff --git a/doc/configuration.txt b/doc/configuration.txt
index ae9c49e31..d43794615 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3433,8 +3433,8 @@ anonkey <key>
   This sets the global anonymizing key to <key>, which must be a 32-bit number
   between 0 and 4294967295. This is the key that will be used by default by CLI
   commands when anonymized mode is enabled. This key may also be set at runtime
-  from the CLI command "set global-key". See also command line argument "-dC"
-  in the management manual.
+  from the CLI command "set anon global-key". See also command line argument
+  "-dC" in the management manual.
 
 quick-exit
   This speeds up the old process exit upon reload by skipping the releasing of
diff --git a/src/cli.c b/src/cli.c
index cf39cb680..62c4fc587 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -3143,7 +3143,8 @@ static struct cli_kw_list cli_kws = {{ },{
 	{ { "expert-mode", NULL },               NULL,                                                                                                cli_parse_expert_experimental_mode, NULL, NULL, NULL, ACCESS_MASTER }, // not listed
 	{ { "experimental-mode", NULL },         NULL,                                                                                                cli_parse_expert_experimental_mode, NULL, NULL, NULL, ACCESS_MASTER }, // not listed
 	{ { "mcli-debug-mode", NULL },         NULL,                                                                                                  cli_parse_expert_experimental_mode, NULL, NULL, NULL, ACCESS_MASTER_ONLY }, // not listed
-	{ { "set", "anon", NULL },               "set anon <setting> [value]              : change the anonymized mode setting",                      cli_parse_set_anon, NULL, NULL },
+	{ { "set", "anon", "on" },               "set anon on [value]                     : activate the anonymized mode",                            cli_parse_set_anon, NULL, NULL },
+	{ { "set", "anon", "off" },              "set anon off                            : deactivate the anonymized mode",                          cli_parse_set_anon, NULL, NULL },
 	{ { "set", "anon", "global-key", NULL }, "set anon global-key <value>             : change the global anonymizing key",                       cli_parse_set_global_key, NULL, NULL },
 	{ { "set", "maxconn", "global",  NULL }, "set maxconn global <value>              : change the per-process maxconn setting",                  cli_parse_set_maxconn_global, NULL },
 	{ { "set", "rate-limit", NULL },         "set rate-limit <setting> <value>        : change a rate limiting value",                            cli_parse_set_ratelimit, NULL },