diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index 4c1a36467..f46ea5919 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -43,7 +43,6 @@ The full documentation is contained in the [API docs](https://github.com/coreos/
 * `-cpuprofile` - The path to a file to output CPU profile data. Enables CPU profiling when present.
 * `-data-dir` - The directory to store log and snapshot. Defaults to the current working directory.
 * `-max-result-buffer` - The max size of result buffer. Defaults to `1024`.
-* `-max-cluster-size` - The max size of the cluster. Defaults to `9`.
 * `-max-retry-attempts` - The max retry attempts when trying to join a cluster. Defaults to `3`.
 * `-peer-addr` - The advertised public hostname:port for server communication. Defaults to `127.0.0.1:7001`.
 * `-peer-bind-addr` - The listening hostname for server communication. Defaults to advertised IP.
diff --git a/config/config.go b/config/config.go
index 167c9b847..acc79a4f0 100644
--- a/config/config.go
+++ b/config/config.go
@@ -36,7 +36,7 @@ var newFlagNameLookup = map[string]string{
 	"d":                      "data-dir",
 	"m":                      "max-result-buffer",
 	"r":                      "max-retry-attempts",
-	"maxsize":                "max-cluster-size",
+	"maxsize":                "cluster-active-size",
 	"clientCAFile":           "ca-file",
 	"clientCert":             "cert-file",
 	"clientKey":              "key-file",
@@ -45,6 +45,7 @@ var newFlagNameLookup = map[string]string{
 	"serverKey":              "peer-key-file",
 	"snapshotCount":          "snapshot-count",
 	"peer-heartbeat-timeout": "peer-heartbeat-interval",
+	"max-cluster-size":       "cluster-active-size",
 }
 
 // Config represents the server configuration.
@@ -297,6 +298,8 @@ func (c *Config) LoadFlags(arguments []string) error {
 	f.IntVar(&c.MaxRetryAttempts, "r", c.MaxRetryAttempts, "(deprecated)")
 	f.IntVar(&c.SnapshotCount, "snapshotCount", c.SnapshotCount, "(deprecated)")
 	f.IntVar(&c.Peer.HeartbeatInterval, "peer-heartbeat-timeout", c.Peer.HeartbeatInterval, "(deprecated)")
+	f.IntVar(&c.Cluster.ActiveSize, "max-cluster-size", c.Cluster.ActiveSize, "(deprecated)")
+	f.IntVar(&c.Cluster.ActiveSize, "maxsize", c.Cluster.ActiveSize, "(deprecated)")
 	// END DEPRECATED FLAGS
 
 	if err := f.Parse(arguments); err != nil {
diff --git a/server/usage.go b/server/usage.go
index ad3b707ab..1ae0cb6ad 100644
--- a/server/usage.go
+++ b/server/usage.go
@@ -53,7 +53,6 @@ Other Options:
   -max-result-buffer   Max size of the result buffer.
   -max-retry-attempts  Number of times a node will try to join a cluster.
   -retry-interval      Seconds to wait between cluster join retry attempts.
-  -max-cluster-size    Maximum number of nodes in the cluster.
   -snapshot=false      Disable log snapshots
   -snapshot-count      Number of transactions before issuing a snapshot.
   -cluster-active-size Number of active nodes in the cluster.