diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f850c086e26..aff498bdd7ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ IMPROVEMENTS:
  * core: Servers can now service client HTTP endpoints [[GH-3892](https://github.com/hashicorp/nomad/issues/3892)]
  * core: Servers can now retry connecting to Vault to verify tokens without requiring a SIGHUP to do so [[GH-3957](https://github.com/hashicorp/nomad/issues/3957)]
  * core: Updated yamux library to pick up memory and CPU performance improvements [[GH-3980](https://github.com/hashicorp/nomad/issues/3980)]
+ * acl: Increase token name limit from 64 characters to 256 [[GH-3888](https://github.com/hashicorp/nomad/issues/3888)]
  * cli: Node status and filesystem related commands do not require direct
    network access to the Nomad client nodes [[GH-3892](https://github.com/hashicorp/nomad/issues/3892)]
  * cli: Common commands highlighed [[GH-4027](https://github.com/hashicorp/nomad/issues/4027)]
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index 5f455e58d3e9..d789e6d0df91 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -114,7 +114,7 @@ const (
 	maxPolicyDescriptionLength = 256
 
 	// maxTokenNameLength limits a ACL token name length
-	maxTokenNameLength = 64
+	maxTokenNameLength = 256
 
 	// ACLClientToken and ACLManagementToken are the only types of tokens
 	ACLClientToken     = "client"