diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3baef056..5f3727195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 ## 0.6.1 (Unreleased)
 
 IMPROVEMENTS:
- * cli: Add autocomplete functionality for flags for all CLI command [GH 3087]
  * core: Add autocomplete functionality for resources: allocations,
    evaluations, jobs, and nodes [GH-2964]
  * core: `distinct_property` constraint can set the number of allocations that
@@ -12,6 +11,7 @@ IMPROVEMENTS:
  * api: Redact Vault.Token from AgentSelf response [GH-2988]
  * cli: node-status displays node version [GH-3002]
  * cli: Disable color output when STDOUT is not a TTY [GH-3057]
+ * cli: Add autocomplete functionality for flags for all CLI command [GH 3087]
  * client: Unmount task directories when alloc is terminal [GH-3006]
  * client/template: Allow template to set Vault grace [GH-2947]
  * client/template: Template emits events explaining why it is blocked [GH-3001]
diff --git a/command/alloc_status.go b/command/alloc_status.go
index 5c714c19b..914d84453 100644
--- a/command/alloc_status.go
+++ b/command/alloc_status.go
@@ -61,12 +61,13 @@ func (c *AllocStatusCommand) Synopsis() string {
 }
 
 func (c *AllocStatusCommand) AutocompleteFlags() complete.Flags {
-	return complete.Flags{
-		"-short":   complete.PredictNothing,
-		"-verbose": complete.PredictNothing,
-		"-json":    complete.PredictNothing,
-		"-t":       complete.PredictAnything,
-	}
+	return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
+		complete.Flags{
+			"-short":   complete.PredictNothing,
+			"-verbose": complete.PredictNothing,
+			"-json":    complete.PredictNothing,
+			"-t":       complete.PredictAnything,
+		})
 }
 
 func (c *AllocStatusCommand) AutocompleteArgs() complete.Predictor {
diff --git a/command/client_config.go b/command/client_config.go
index 4fa8c2f85..541b2735f 100644
--- a/command/client_config.go
+++ b/command/client_config.go
@@ -115,7 +115,7 @@ func (c *ClientConfigCommand) AutocompleteFlags() complete.Flags {
 	return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
 		complete.Flags{
 			"-servers":        complete.PredictNothing,
-			"-update-servers": complete.PredictNothing,
+			"-update-servers": complete.PredictAnything,
 		})
 }
 
diff --git a/command/deployment_pause.go b/command/deployment_pause.go
index 4efb6a0aa..6ca24d897 100644
--- a/command/deployment_pause.go
+++ b/command/deployment_pause.go
@@ -32,7 +32,7 @@ Pause Options:
 }
 
 func (c *DeploymentPauseCommand) Synopsis() string {
-	return "Pause a deployment."
+	return "Pause a deployment"
 }
 
 func (c *DeploymentPauseCommand) AutocompleteFlags() complete.Flags {
diff --git a/command/deployment_promote.go b/command/deployment_promote.go
index 2bdf03cd7..64f227f42 100644
--- a/command/deployment_promote.go
+++ b/command/deployment_promote.go
@@ -48,7 +48,7 @@ Promote Options:
 }
 
 func (c *DeploymentPromoteCommand) Synopsis() string {
-	return "Promote canaries in a deployment."
+	return "Promote canaries in a deployment"
 }
 
 func (c *DeploymentPromoteCommand) AutocompleteFlags() complete.Flags {