diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 1899152cf3..0695674239 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -374,7 +374,7 @@ _brew ()
     done
 
     if [[ $i -eq $COMP_CWORD ]]; then
-        local ext=$(\ls -p $(brew --repository)/Library/Contributions/cmds \
+        local ext=$(\ls -p $(brew --repository)/Library/Contributions/cmd \
                 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \
                 -e "s/.*\///g")
         __brewcomp "
diff --git a/Library/Contributions/brew_fish_completion.fish b/Library/Contributions/brew_fish_completion.fish
index 08bfb3c41b..e037ae480e 100644
--- a/Library/Contributions/brew_fish_completion.fish
+++ b/Library/Contributions/brew_fish_completion.fish
@@ -10,7 +10,7 @@ for command in (ls (brew --repository)/Library/Homebrew/cmd | sed -e "s/\.rb//g"
   set commands $command $commands
 end
 
-for command in (ls -p (brew --repository)/Library/Contributions/cmds | sed -e "s/\.rb//g" -e "s/brew-//g" -e "s/.*\///g")
+for command in (ls -p (brew --repository)/Library/Contributions/cmd | sed -e "s/\.rb//g" -e "s/brew-//g" -e "s/.*\///g")
   set commands $command $commands
 end
 
diff --git a/Library/Contributions/cmds/brew-aspell-dictionaries b/Library/Contributions/cmd/brew-aspell-dictionaries
similarity index 99%
rename from Library/Contributions/cmds/brew-aspell-dictionaries
rename to Library/Contributions/cmd/brew-aspell-dictionaries
index f6677ac544..a5cdb1ac35 100755
--- a/Library/Contributions/cmds/brew-aspell-dictionaries
+++ b/Library/Contributions/cmd/brew-aspell-dictionaries
@@ -49,4 +49,3 @@ EOF
 rm $tmp_file
 
 echo "The formulae for the aspell dictionaries have been written to\n$brew_formulae_tmp_file"
-
diff --git a/Library/Contributions/cmds/brew-beer.rb b/Library/Contributions/cmd/brew-beer.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-beer.rb
rename to Library/Contributions/cmd/brew-beer.rb
diff --git a/Library/Contributions/cmds/brew-dirty.rb b/Library/Contributions/cmd/brew-dirty.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-dirty.rb
rename to Library/Contributions/cmd/brew-dirty.rb
diff --git a/Library/Contributions/cmds/brew-graph b/Library/Contributions/cmd/brew-graph
similarity index 100%
rename from Library/Contributions/cmds/brew-graph
rename to Library/Contributions/cmd/brew-graph
diff --git a/Library/Contributions/cmds/brew-grep b/Library/Contributions/cmd/brew-grep
similarity index 100%
rename from Library/Contributions/cmds/brew-grep
rename to Library/Contributions/cmd/brew-grep
diff --git a/Library/Contributions/cmds/brew-leaves.rb b/Library/Contributions/cmd/brew-leaves.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-leaves.rb
rename to Library/Contributions/cmd/brew-leaves.rb
diff --git a/Library/Contributions/cmds/brew-linkapps.rb b/Library/Contributions/cmd/brew-linkapps.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-linkapps.rb
rename to Library/Contributions/cmd/brew-linkapps.rb
diff --git a/Library/Contributions/cmds/brew-ls-taps.rb b/Library/Contributions/cmd/brew-ls-taps.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-ls-taps.rb
rename to Library/Contributions/cmd/brew-ls-taps.rb
diff --git a/Library/Contributions/cmds/brew-man b/Library/Contributions/cmd/brew-man
similarity index 100%
rename from Library/Contributions/cmds/brew-man
rename to Library/Contributions/cmd/brew-man
diff --git a/Library/Contributions/cmds/brew-mirror-check.rb b/Library/Contributions/cmd/brew-mirror-check.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-mirror-check.rb
rename to Library/Contributions/cmd/brew-mirror-check.rb
diff --git a/Library/Contributions/cmds/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-pull.rb
rename to Library/Contributions/cmd/brew-pull.rb
diff --git a/Library/Contributions/cmds/brew-readall.rb b/Library/Contributions/cmd/brew-readall.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-readall.rb
rename to Library/Contributions/cmd/brew-readall.rb
diff --git a/Library/Contributions/cmds/brew-server b/Library/Contributions/cmd/brew-server
similarity index 95%
rename from Library/Contributions/cmds/brew-server
rename to Library/Contributions/cmd/brew-server
index 5c55c05fa2..a873224093 100755
--- a/Library/Contributions/cmds/brew-server
+++ b/Library/Contributions/cmd/brew-server
@@ -47,13 +47,13 @@ def html_page
     </head>
     <body>
       <div id="wrap">
-  			<div id="header">
-  				<h1><a href="./">Homebrew</a></h1>
-  				<p id="subtitle"><strong>The missing package manager for OS X</strong></p>
+			<div id="header">
+				<h1><a href="./">Homebrew</a></h1>
+				<p id="subtitle"><strong>The missing package manager for OS X</strong></p>
                                 <p id="installed"><a href="/installed">Show installed packages</a></p>
-  			</div>
+			</div>
 
-  			<div id="informations">
+			<div id="informations">
   HTML
   yield body
   body += <<-HTML
diff --git a/Library/Contributions/cmds/brew-services.rb b/Library/Contributions/cmd/brew-services.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-services.rb
rename to Library/Contributions/cmd/brew-services.rb
diff --git a/Library/Contributions/cmds/brew-switch.rb b/Library/Contributions/cmd/brew-switch.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-switch.rb
rename to Library/Contributions/cmd/brew-switch.rb
diff --git a/Library/Contributions/cmds/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
similarity index 99%
rename from Library/Contributions/cmds/brew-test-bot.rb
rename to Library/Contributions/cmd/brew-test-bot.rb
index fde532ef26..58e4f5e6c1 100755
--- a/Library/Contributions/cmds/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -11,7 +11,7 @@ require 'formula'
 require 'utils'
 require 'date'
 
-HOMEBREW_CONTRIBUTED_CMDS = HOMEBREW_REPOSITORY + "Library/Contributions/cmds/"
+HOMEBREW_CONTRIBUTED_CMDS = HOMEBREW_REPOSITORY + "Library/Contributions/cmd/"
 
 class Step
   attr_reader :command, :repository
diff --git a/Library/Contributions/cmds/brew-tests.rb b/Library/Contributions/cmd/brew-tests.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-tests.rb
rename to Library/Contributions/cmd/brew-tests.rb
diff --git a/Library/Contributions/cmds/brew-unpack.rb b/Library/Contributions/cmd/brew-unpack.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-unpack.rb
rename to Library/Contributions/cmd/brew-unpack.rb
diff --git a/Library/Contributions/cmds/brew-which.rb b/Library/Contributions/cmd/brew-which.rb
similarity index 100%
rename from Library/Contributions/cmds/brew-which.rb
rename to Library/Contributions/cmd/brew-which.rb
diff --git a/Library/Contributions/cmds/git b/Library/Contributions/cmd/git
similarity index 100%
rename from Library/Contributions/cmds/git
rename to Library/Contributions/cmd/git
diff --git a/Library/Contributions/cmds/svn b/Library/Contributions/cmd/svn
similarity index 100%
rename from Library/Contributions/cmds/svn
rename to Library/Contributions/cmd/svn
diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index 62c2226931..ca45427eea 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -342,7 +342,7 @@ to create your own commands without modifying Homebrew's internals.
 A number of (useful, but unsupported) external commands are included and enabled
 by default:
 
-    $ ls `brew --repository`/Library/Contributions/cmds
+    $ ls `brew --repository`/Library/Contributions/cmd
 
 Documentation for the included external commands as well as instructions for
 creating your own can be found on the wiki:
diff --git a/bin/brew b/bin/brew
index 5fd2fc82a2..ea46c9b07f 100755
--- a/bin/brew
+++ b/bin/brew
@@ -82,7 +82,7 @@ begin
   end
 
   # Add example external commands to PATH before checking.
-  ENV['PATH'] += ":#{HOMEBREW_REPOSITORY}/Library/Contributions/cmds"
+  ENV['PATH'] += ":#{HOMEBREW_REPOSITORY}/Library/Contributions/cmd"
   if require? HOMEBREW_REPOSITORY/"Library/Homebrew/cmd"/cmd
     Homebrew.send cmd.to_s.gsub('-', '_').downcase
   elsif which "brew-#{cmd}"
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 7f8cef365c..5003f44a6d 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -382,7 +382,7 @@ A number of (useful, but unsupported) external commands are included and enabled
 .
 .nf
 
-$ ls `brew \-\-repository`/Library/Contributions/cmds
+$ ls `brew \-\-repository`/Library/Contributions/cmd
 .
 .fi
 .