diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 089872a156..a645ebeaac 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -136,6 +136,11 @@ _brew_deps ()
     __brew_complete_formulae
 }
 
+_brew_doctor () {
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    __brewcomp "$(brew doctor --list-checks)"
+}
+
 _brew_diy ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
@@ -425,6 +430,7 @@ _brew ()
     cleanup)                    _brew_cleanup ;;
     create)                     _brew_create ;;
     deps)                       _brew_deps ;;
+    doctor|dr)                  _brew_doctor ;;
     diy|configure)              _brew_diy ;;
     fetch)                      _brew_fetch ;;
     info|abv)                   _brew_info ;;
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 4a4496fbd2..e939e2a2cb 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -994,6 +994,11 @@ module Homebrew extend self
   def doctor
     checks = Checks.new
 
+    if ARGV.include? '--list-checks'
+      checks.methods.select { |m| m =~ /^check_/ }.sort.each { |m| puts m }
+      exit
+    end
+
     inject_dump_stats(checks) if ARGV.switch? 'D'
 
     methods = if ARGV.named.empty?