diff --git a/completions/bash/brew b/completions/bash/brew
index e05248d8a0..b3cd262559 100644
--- a/completions/bash/brew
+++ b/completions/bash/brew
@@ -601,8 +601,8 @@ _brew_cleanup() {
       --prune
       --prune-prefix
       --quiet
+      --scrub
       --verbose
-      -s
       "
       return
       ;;
diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish
index b49787810a..b00bd62b4e 100644
--- a/completions/fish/brew.fish
+++ b/completions/fish/brew.fish
@@ -487,8 +487,8 @@ __fish_brew_complete_arg 'cleanup' -l help -d 'Show this message'
 __fish_brew_complete_arg 'cleanup' -l prune -d 'Remove all cache files older than specified days. If you want to remove everything, use `--prune=all`'
 __fish_brew_complete_arg 'cleanup' -l prune-prefix -d 'Only prune the symlinks and directories from the prefix and remove no other files'
 __fish_brew_complete_arg 'cleanup' -l quiet -d 'Make some output more quiet'
+__fish_brew_complete_arg 'cleanup' -l scrub -d 'Scrub the cache, including downloads for even the latest versions. Note that downloads for any installed formulae or casks will still not be deleted. If you want to delete those too: `rm -rf "$(brew --cache)"`'
 __fish_brew_complete_arg 'cleanup' -l verbose -d 'Make some output more verbose'
-__fish_brew_complete_arg 'cleanup' -l s -d 'Scrub the cache, including downloads for even the latest versions. Note that downloads for any installed formulae or casks will still not be deleted. If you want to delete those too: `rm -rf "$(brew --cache)"`'
 __fish_brew_complete_arg 'cleanup' -a '(__fish_brew_suggest_formulae_all)'
 __fish_brew_complete_arg 'cleanup' -a '(__fish_brew_suggest_casks_all)'
 
diff --git a/completions/zsh/_brew b/completions/zsh/_brew
index b8001fc2d0..0a35bc8922 100644
--- a/completions/zsh/_brew
+++ b/completions/zsh/_brew
@@ -626,8 +626,8 @@ _brew_cleanup() {
     '--prune[Remove all cache files older than specified days. If you want to remove everything, use `--prune=all`]' \
     '--prune-prefix[Only prune the symlinks and directories from the prefix and remove no other files]' \
     '--quiet[Make some output more quiet]' \
+    '--scrub[Scrub the cache, including downloads for even the latest versions. Note that downloads for any installed formulae or casks will still not be deleted. If you want to delete those too: `rm -rf "$(brew --cache)"`]' \
     '--verbose[Make some output more verbose]' \
-    '-s[Scrub the cache, including downloads for even the latest versions. Note that downloads for any installed formulae or casks will still not be deleted. If you want to delete those too: `rm -rf "$(brew --cache)"`]' \
     - formula \
     '*::formula:__brew_formulae' \
     - cask \
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 5baf1665b1..b3cfef5b84 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -142,7 +142,7 @@ old. This can be adjusted with `HOMEBREW_CLEANUP_MAX_AGE_DAYS`.
 
 : Show what would be removed, but do not actually remove anything.
 
-`-s`
+`-s`, `--scrub`
 
 : Scrub the cache, including downloads for even the latest versions. Note that
   downloads for any installed formulae or casks will still not be deleted. If
diff --git a/manpages/brew.1 b/manpages/brew.1
index ef2aa22297..40a761df55 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -88,7 +88,7 @@ Remove all cache files older than specified \fIdays\fP\&\. If you want to remove
 \fB\-n\fP, \fB\-\-dry\-run\fP
 Show what would be removed, but do not actually remove anything\.
 .TP
-\fB\-s\fP
+\fB\-s\fP, \fB\-\-scrub\fP
 Scrub the cache, including downloads for even the latest versions\. Note that downloads for any installed formulae or casks will still not be deleted\. If you want to delete those too: \fBrm \-rf "$(brew \-\-cache)"\fP
 .TP
 \fB\-\-prune\-prefix\fP