diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown
index d0e3b950e2..585d1ffb5a 100644
--- a/website/source/docs/agent/options.html.markdown
+++ b/website/source/docs/agent/options.html.markdown
@@ -267,6 +267,11 @@ definitions support being updated during a reload.
for servers in the [`acl_datacenter`](#acl_datacenter). This token will be created with management-level
permissions if it does not exist. It allows operators to bootstrap the ACL system
with a token ID that is well-known.
+
+ Note that the `acl_master_token` is only installed when a server acquires cluster leadership. If
+ you would like to install or change the `acl_master_token`, set the new value for `acl_master_token`
+ in the configuration for all servers. Once this is done, restart the current leader to force a
+ leader election.
* `acl_token` - When provided, the agent will use this
token when making requests to the Consul servers. Clients can override this token on a per-request
diff --git a/website/source/docs/internals/acl.html.markdown b/website/source/docs/internals/acl.html.markdown
index 8d6aa4855a..321250eeba 100644
--- a/website/source/docs/internals/acl.html.markdown
+++ b/website/source/docs/internals/acl.html.markdown
@@ -86,9 +86,13 @@ key "_rexec/" {
### Bootstrapping ACLs
-Bootstrapping the ACL system is done by providing an initial `acl_master_token`
-[configuration](/docs/agent/options.html), which will be created as a
-"management" type token if it does not exist.
+Bootstrapping the ACL system is done by providing an initial [`acl_master_token`
+configuration](/docs/agent/options.html#acl_master_token), which will be created
+as a "management" type token if it does not exist. Note that the `acl_master_token`
+is only installed when a server acquires cluster leadership. If you would
+like to install or change the `acl_master_token`, set the new value for
+`acl_master_token` in the configuration for all servers. Once this is done, restart the
+current leader to force a leader election.
## Rule Specification