diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index ddd9c17e01..756621cf54 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -21,8 +21,7 @@ _brew_to_completion()
         return 0
     # Subcommands
     else
-        brew_base=`which brew`
-        brew_base=`dirname ${brew_base}`/..
+        brew_base=`brew --repository`
         
         case ${prev} in
             # Commands that take a formula...
diff --git a/bin/brew b/bin/brew
index c3c5938d11..0b14d9751d 100755
--- a/bin/brew
+++ b/bin/brew
@@ -75,6 +75,8 @@ begin
   case arg = ARGV.shift
   when '--prefix'
     puts HOMEBREW_PREFIX
+  when '--repository'
+    puts HOMEBREW_REPOSITORY
   when '--config'
     dump_config