diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index ee2bcbed33..a0ab0facaf 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -450,7 +450,7 @@ _brew ()
                 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \
                 -e "s/.*\///g")
         __brewcomp "
-            --cache --cellar --config
+            --cache --cellar config
             --env --prefix --repository
             audit
             cat
diff --git a/Library/Contributions/brew_zsh_completion.zsh b/Library/Contributions/brew_zsh_completion.zsh
index ab889d405e..0cae580fb5 100644
--- a/Library/Contributions/brew_zsh_completion.zsh
+++ b/Library/Contributions/brew_zsh_completion.zsh
@@ -77,7 +77,7 @@ local -a formulae installed_formulae installed_taps outdated_formulae running_se
 _arguments \
   '(-v)-v[verbose]' \
   '(--cellar)--cellar[brew cellar]' \
-  '(--config)--config[brew configuration]' \
+  '(config)--config[brew configuration]' \
   '(--env)--env[brew environment]' \
   '(--repository)--repository[brew repository]' \
   '(--version)--version[version information]' \
diff --git a/Library/Contributions/cmd/brew-gist-logs.rb b/Library/Contributions/cmd/brew-gist-logs.rb
index 102bf7660a..7d4e1c1102 100755
--- a/Library/Contributions/cmd/brew-gist-logs.rb
+++ b/Library/Contributions/cmd/brew-gist-logs.rb
@@ -37,7 +37,7 @@ def load_logs name
 end
 
 def append_config files
-  files['config.out'] = {:content => `brew --config 2>&1`}
+  files['config.out'] = {:content => `brew config 2>&1`}
 end
 
 def append_doctor files
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index 9832693c8e..fa00758845 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -276,7 +276,7 @@ class Test
     return if ARGV.include? "--skip-setup"
     test "brew doctor"
     test "brew --env"
-    test "brew --config"
+    test "brew config"
   end
 
   def formula formula
diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index be2f8c98c4..8e9f6ba7b4 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -67,6 +67,11 @@ Note that these flags should only appear after a command.
   * `commands`:
     Show a list of built-in and external commands.
 
+  * `config`:
+    Show Homebrew and system configuration useful for debugging. If you file
+    a bug report, you will likely be asked for this information if you do not
+    provide it.
+
   * `create <URL> [--autotools|--cmake] [--no-fetch] [--set-name <name>] [--set-version <version>]`:
     Generate a formula for the downloadable file at <URL> and open it in the editor.
     Homebrew will attempt to automatically derive the formula name
@@ -391,11 +396,6 @@ Note that these flags should only appear after a command.
     Display the location in the cellar where <formula> would be installed,
     without any sort of versioned directory as the last path.
 
-  * `--config`:
-    Show Homebrew and system configuration useful for debugging. If you file
-    a bug report, you will likely be asked for this information if you do not
-    provide it.
-
   * `--env`:
     Show a summary of the Homebrew build environment.
 
diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/config.rb
similarity index 99%
rename from Library/Homebrew/cmd/--config.rb
rename to Library/Homebrew/cmd/config.rb
index a6df1a2c67..fb3fb77726 100644
--- a/Library/Homebrew/cmd/--config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -1,7 +1,7 @@
 require 'hardware'
 
 module Homebrew extend self
-  def __config
+  def config
     dump_verbose_config
   end
 
diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb
index b76e363f7f..d185c41e2c 100644
--- a/Library/Homebrew/cmd/help.rb
+++ b/Library/Homebrew/cmd/help.rb
@@ -12,7 +12,7 @@ Example usage:
 Troubleshooting:
   brew doctor
   brew install -vd FORMULA
-  brew [--env | --config]
+  brew [--env | config]
 
 Brewing:
   brew create [URL [--no-fetch]]
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 8c4abc126f..7cdd24cb10 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -190,7 +190,7 @@ class BuildError < Homebrew::InstallationError
         puts "  #{tap_issues_url}"
       end
     else
-      require 'cmd/--config'
+      require 'cmd/config'
       require 'cmd/--env'
 
       unless formula.core_formula?
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 9b8de904e8..d6a6f60e13 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -570,7 +570,7 @@ class Formula
         f.flush
         Kernel.system "/usr/bin/tail", "-n", "5", logfn unless ARGV.verbose?
         f.puts
-        require 'cmd/--config'
+        require 'cmd/config'
         Homebrew.write_build_config(f)
         raise BuildError.new(self, cmd, args, $?)
       end
diff --git a/Library/Homebrew/os/mac/hardware.rb b/Library/Homebrew/os/mac/hardware.rb
index e2778590a2..7bda71fa49 100644
--- a/Library/Homebrew/os/mac/hardware.rb
+++ b/Library/Homebrew/os/mac/hardware.rb
@@ -58,7 +58,7 @@ module MacCPUs
         :g4e # PowerPC 7450
       when 100
         # This is the only 64-bit PPC CPU type, so it's useful
-        # to distinguish in `brew --config` output and in bottle tags
+        # to distinguish in `brew config` output and in bottle tags
         MacOS.prefer_64_bit? ? :g5_64 : :g5  # PowerPC 970
       else
         :dunno
diff --git a/Library/brew.rb b/Library/brew.rb
index a274979120..5927193405 100755
--- a/Library/brew.rb
+++ b/Library/brew.rb
@@ -85,7 +85,7 @@ begin
              'dr' => 'doctor',
              '--repo' => '--repository',
              'environment' => '--env',
-             '-c1' => '--config',
+             '--config' => 'config',
              }
 
   cmd = ARGV.shift
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index def92b3997..13870c5d84 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -75,6 +75,10 @@ If \fB\-s\fR is passed, scrubs the cache, removing downloads for even the latest
 Show a list of built\-in and external commands\.
 .
 .TP
+\fBconfig\fR
+Show Homebrew and system configuration useful for debugging\. If you file a bug report, you will likely be asked for this information if you do not provide it\.
+.
+.TP
 \fBcreate <URL> [\-\-autotools|\-\-cmake] [\-\-no\-fetch] [\-\-set\-name <name>] [\-\-set\-version <version>]\fR
 Generate a formula for the downloadable file at \fIURL\fR and open it in the editor\. Homebrew will attempt to automatically derive the formula name and version, but if it fails, you\'ll have to make your own template\. The wget formula serves as a simple example\. For a complete cheat\-sheet, have a look at
 .
@@ -417,10 +421,6 @@ Display Homebrew\'s Cellar path\. \fIDefault:\fR \fB/usr/local/Cellar\fR
 Display the location in the cellar where \fIformula\fR would be installed, without any sort of versioned directory as the last path\.
 .
 .TP
-\fB\-\-config\fR
-Show Homebrew and system configuration useful for debugging\. If you file a bug report, you will likely be asked for this information if you do not provide it\.
-.
-.TP
 \fB\-\-env\fR
 Show a summary of the Homebrew build environment\.
 .