diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 7f03523fe1..f33204d369 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -15,7 +15,7 @@ _brew_to_completion()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     
     # We only complete unabbreviated commands...
-    actions="diy edit homepage info install list link make uninstall"
+    actions="edit homepage info install list link make uninstall"
     
     # Subcommand list
     if [[ ( ${COMP_CWORD} -eq 1 ) && ( ${COMP_WORDS[0]} == brew )  ]] ; then
diff --git a/bin/brew b/bin/brew
index 575694fdb2..47215866c6 100755
--- a/bin/brew
+++ b/bin/brew
@@ -115,7 +115,7 @@ begin
         exec "mate", *ARGV.named.collect {|name| make name}
       end
 
-    when 'diy'
+    when 'diy', 'configure'
       puts diy
 
     when 'info', 'abv'