diff --git a/.bashrc b/.bashrc
index 6392458..4ebcb7a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -12,6 +12,11 @@ fi
 if [ -f /usr/local/etc/bash_completion.d/git-prompt.sh ]; then
 	source /usr/local/etc/bash_completion.d/git-prompt.sh
 fi
+if type brew 2&>/dev/null; then
+  for completion_file in $(brew --prefix)/etc/bash_completion.d/*; do
+    source "$completion_file"
+  done
+fi
 
 export EDITOR=vim
 
@@ -43,7 +48,7 @@ if [ "$(uname)" = "Darwin" ]; then
 fi
 
 alias ls="ls ${colorOption}"
-alias grep="grep --color-auto"
+alias grep="grep --color=auto"
 alias egrep="egrep --color=auto"
 alias fgrep="fgrep --color=auto"