diff --git a/clicommand/artifact_download.go b/clicommand/artifact_download.go
index 1584644204..ae0e0d6a69 100644
--- a/clicommand/artifact_download.go
+++ b/clicommand/artifact_download.go
@@ -22,7 +22,7 @@ Description:
 
 Example:
 
-   $ buildkite-agent artifact download "pkg/*.tar.gz" . --build xxx
+   $ buildkite-agent artifact download --build xxx "pkg/*.tar.gz" .
 
    This will search across all the artifacts for the build with files that match that part.
    The first argument is the search query, and the second argument is the download destination.
@@ -30,9 +30,14 @@ Example:
    If you're trying to download a specific file, and there are multiple artifacts from different
    jobs, you can target the particular job you want to download the artifact from:
 
-   $ buildkite-agent artifact download "pkg/*.tar.gz" . --step "tests" --build xxx
+   $ buildkite-agent artifact download --step "tests" --build xxx "pkg/*.tar.gz" .
 
-   You can also use the step's jobs id (provided by the environment variable $BUILDKITE_JOB_ID)`
+   You can also use the step's job id (provided by the environment variable $BUILDKITE_JOB_ID)
+
+   By default, only artifacts from the most recent job in a chain of retried jobs are downloaded.
+   To include artifacts from previous retried jobs, use the "--include-retried-jobs" flag:
+
+   $ buildkite-agent artifact download --include-retried-jobs "pkg/*.tar.gz" .`
 
 type ArtifactDownloadConfig struct {
 	Query              string `cli:"arg:0" label:"artifact search query" validate:"required"`
@@ -73,7 +78,7 @@ var ArtifactDownloadCommand = cli.Command{
 		cli.BoolFlag{
 			Name:   "include-retried-jobs",
 			EnvVar: "BUILDKITE_AGENT_INCLUDE_RETRIED_JOBS",
-			Usage:  "Include artifacts from retried jobs in the search",
+			Usage:  "Include artifacts from previous retried jobs in the search",
 		},
 
 		// API Flags
diff --git a/clicommand/artifact_upload.go b/clicommand/artifact_upload.go
index 3207d7346d..759f338e84 100644
--- a/clicommand/artifact_upload.go
+++ b/clicommand/artifact_upload.go
@@ -22,7 +22,7 @@ Description:
    You can specify an alternate destination on Amazon S3, Google Cloud Storage
    or Artifactory as per the examples below. This may be specified in the
    'destination' argument, or in the 'BUILDKITE_ARTIFACT_UPLOAD_DESTINATION'
-   environment variable.  Otherwise, artifacts are uploaded to a
+   environment variable. Otherwise, artifacts are uploaded to a
    Buildkite-managed Amazon S3 bucket.
 
 Example: