diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash
index 50f6c08d..5cbd1595 100644
--- a/completion/available/brew.completion.bash
+++ b/completion/available/brew.completion.bash
@@ -1,9 +1,11 @@
 if which brew >/dev/null 2>&1; then
-  if [ -f `brew --prefix`/etc/bash_completion ]; then
-    . `brew --prefix`/etc/bash_completion
+  BREW_PREFIX=$(brew --prefix)
+
+  if [ -f "$BREW_PREFIX"/etc/bash_completion.d/brew ]; then
+    . "$BREW_PREFIX"/etc/bash_completion.d/brew
   fi
 
-  if [ -f `brew --prefix`/Library/Contributions/brew_bash_completion.sh ]; then
-    . `brew --prefix`/Library/Contributions/brew_bash_completion.sh
+  if [ -f "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]; then
+    . "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
   fi
 fi