diff --git a/command/agent/command.go b/command/agent/command.go
index 1f206b4e6..531c3e87a 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -469,50 +469,29 @@ Usage: nomad agent [options]
   Starts the Nomad agent and runs until an interrupt is received.
   The agent may be a client and/or server.
 
+  The Nomad agent's configuration primarily comes from the config
+  files used, but a subset of the options may also be passed directly
+  as CLI arguments, listed below.
+
 Options:
 
-  -advertise=addr          Sets the advertise address to use
-  -atlas=org/name          Sets the Atlas infrastructure name, enables SCADA.
-  -atlas-join              Enables auto-joining the Atlas cluster
-  -atlas-token=token       Provides the Atlas API token
-  -bootstrap               Sets server to bootstrap mode
-  -bind=0.0.0.0            Sets the bind address for cluster communication
-  -bootstrap-expect=0      Sets server to expect bootstrap mode.
-  -client=127.0.0.1        Sets the address to bind for client access.
-                           This includes RPC, DNS, HTTP and HTTPS (if configured)
-  -config-file=foo         Path to a JSON file to read configuration from.
-                           This can be specified multiple times.
-  -config-dir=foo          Path to a directory to read configuration files
-                           from. This will read every file ending in ".json"
-                           as configuration in this directory in alphabetical
-                           order. This can be specified multiple times.
-  -data-dir=path           Path to a data directory to store agent state
-  -recursor=1.2.3.4        Address of an upstream DNS server.
-                           Can be specified multiple times.
-  -dc=east-aws             Datacenter of the agent
-  -encrypt=key             Provides the gossip encryption key
-  -join=1.2.3.4            Address of an agent to join at start time.
-                           Can be specified multiple times.
-  -join-wan=1.2.3.4        Address of an agent to join -wan at start time.
-                           Can be specified multiple times.
-  -retry-join=1.2.3.4      Address of an agent to join at start time with
-                           retries enabled. Can be specified multiple times.
-  -retry-interval=30s      Time to wait between join attempts.
-  -retry-max=0             Maximum number of join attempts. Defaults to 0, which
-                           will retry indefinitely.
-  -retry-join-wan=1.2.3.4  Address of an agent to join -wan at start time with
-                           retries enabled. Can be specified multiple times.
-  -retry-interval-wan=30s  Time to wait between join -wan attempts.
-  -retry-max-wan=0         Maximum number of join -wan attempts. Defaults to 0, which
-                           will retry indefinitely.
-  -log-level=info          Log level of the agent.
-  -node=hostname           Name of this node. Must be unique in the cluster
-  -protocol=N              Sets the protocol version. Defaults to latest.
-  -rejoin                  Ignores a previous leave and attempts to rejoin the cluster.
-  -server                  Switches agent to server mode.
-  -syslog                  Enables logging to syslog
-  -ui-dir=path             Path to directory containing the Web UI resources
-  -pid-file=path           Path to file to store agent PID
+  -config=<path>
+    The path to either a single config file or a directory of config
+    files to use for configuring the Nomad agent. This option may be
+    specified multiple times. If multiple config files are used, the
+    values from each will be merged together. During merging, values
+    from files found later in the list are merged over values from
+    previously parsed files.
+
+  -log-level=<level>
+    Specify the verbosity level of Nomad's logs. Valid values include
+    DEBUG, INFO, and WARN, in decreasing order of verbosity.
+
+  -dev
+    Start the agent in development mode. This enables a pre-configured
+    dual-role agent (client + server) which is useful for developing
+    or testing Nomad. No other configuration is required to start the
+    agent in this mode.
  `
 	return strings.TrimSpace(helpText)
 }