diff --git a/brew.sh b/brew.sh
index ef77e16..dbbc607 100755
--- a/brew.sh
+++ b/brew.sh
@@ -23,6 +23,11 @@ brew install vim --override-system-vi
 brew install homebrew/dupes/grep
 brew install homebrew/dupes/openssh
 
+# Install zsh and addons
+brew install zsh
+brew install zsh-completions
+brew install zsh-syntax-highlighting
+
 # Install other useful utilities
 brew install ack
 brew install git
diff --git a/zshrc b/zshrc
index d3c5887..b495e55 100644
--- a/zshrc
+++ b/zshrc
@@ -130,6 +130,7 @@ export LSCOLORS='dxfxcxdxbxegedabagacad'
 export LS_COLORS='di=33;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
 
 # Add zsh-completions to the fpath
-fpath=(/usr/local/share/zsh-completions $fpath)
+# They are packaged correctly for Arch Linux
+test "$platform" = 'osx' && fpath=(/usr/local/share/zsh-completions $fpath)
 
 test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_integration.zsh