diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index e8ac7e660..5b7295d6d 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -35,7 +35,7 @@ var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
 var fConfig = flag.String("config", "", "configuration file to load")
 var fConfigDirectory = flag.String("config-directory", "",
 	"directory containing additional *.conf files")
-var fVersion = flag.Bool("version", false, "display the version")
+var fVersion = flag.Bool("version", false, "display the version and exit")
 var fSampleConfig = flag.Bool("sample-config", false,
 	"print out full sample configuration")
 var fPidfile = flag.String("pidfile", "", "file to write our pid to")
@@ -54,7 +54,7 @@ var fProcessorFilters = flag.String("processor-filter", "",
 var fUsage = flag.String("usage", "",
 	"print usage for a plugin, ie, 'telegraf --usage mysql'")
 var fService = flag.String("service", "",
-	"operate on the service")
+	"operate on the service (windows only)")
 var fRunAsConsole = flag.Bool("console", false, "run as console application (windows only)")
 
 var (
diff --git a/internal/usage.go b/internal/usage.go
index 4c00d8f83..99db5aebb 100644
--- a/internal/usage.go
+++ b/internal/usage.go
@@ -13,15 +13,22 @@ The commands & flags are:
   config              print out full sample configuration to stdout
   version             print the version to stdout
 
-  --config <file>     configuration file to load
-  --test              gather metrics once, print them to stdout, and exit
-  --config-directory  directory containing additional *.conf files
-  --input-filter      filter the input plugins to enable, separator is :
-  --output-filter     filter the output plugins to enable, separator is :
-  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
-  --debug             print metrics as they're generated to stdout
-  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
-  --quiet             run in quiet mode
+  --aggregator-filter <filter>   filter the aggregators to enable, separator is :
+  --config <file>                configuration file to load
+  --config-directory <directory> directory containing additional *.conf files
+  --debug                        turn on debug logging
+  --input-filter <filter>        filter the inputs to enable, separator is :
+  --input-list                   print available input plugins.
+  --output-filter <filter>       filter the outputs to enable, separator is :
+  --output-list                  print available output plugins.
+  --pidfile <file>               file to write our pid to
+  --pprof-addr <address>         pprof address to listen on, don't activate pprof if empty
+  --processor-filter <filter>    filter the processors to enable, separator is :
+  --quiet                        run in quiet mode
+  --sample-config                print out full sample configuration
+  --test                         gather metrics, print them out, and exit
+  --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
+  --version                      display the version and exit
 
 Examples:
 
diff --git a/internal/usage_windows.go b/internal/usage_windows.go
index 109d309ed..585c2996f 100644
--- a/internal/usage_windows.go
+++ b/internal/usage_windows.go
@@ -13,18 +13,25 @@ The commands & flags are:
   config              print out full sample configuration to stdout
   version             print the version to stdout
 
-  --config <file>     configuration file to load
-  --test              gather metrics once, print them to stdout, and exit
-  --config-directory  directory containing additional *.conf files
-  --input-filter      filter the input plugins to enable, separator is :
-  --output-filter     filter the output plugins to enable, separator is :
-  --usage             print usage for a plugin, ie, 'telegraf --usage mysql'
-  --debug             print metrics as they're generated to stdout
-  --pprof-addr        pprof address to listen on, format: localhost:6060 or :6060
-  --quiet             run in quiet mode
+  --aggregator-filter <filter>   filter the aggregators to enable, separator is :
+  --config <file>                configuration file to load
+  --config-directory <directory> directory containing additional *.conf files
+  --debug                        turn on debug logging
+  --input-filter <filter>        filter the inputs to enable, separator is :
+  --input-list                   print available input plugins.
+  --output-filter <filter>       filter the outputs to enable, separator is :
+  --output-list                  print available output plugins.
+  --pidfile <file>               file to write our pid to
+  --pprof-addr <address>         pprof address to listen on, don't activate pprof if empty
+  --processor-filter <filter>    filter the processors to enable, separator is :
+  --quiet                        run in quiet mode
+  --sample-config                print out full sample configuration
+  --test                         gather metrics, print them out, and exit
+  --usage <plugin>               print usage for a plugin, ie, 'telegraf --usage mysql'
+  --version                      display the version and exit
 
-  --console           run as console application
-  --service           operate on service, one of: install, uninstall, start, stop
+  --console                      run as console application (windows only)
+  --service <service>            operate on the service (windows only)
 
 Examples: