diff --git a/Rakefile b/Rakefile
index cdc7a0c..ba4fbaf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -136,7 +136,7 @@ def install_homebrew
   puts "======================================================"
   puts "Installing Homebrew packages...There may be some warnings."
   puts "======================================================"
-  run %{brew install zsh git tmux reattach-to-user-namespace}
+  run %{brew install zsh git tmux reattach-to-user-namespace z}
   run %{brew install macvim --custom-icons --override-system-vim --with-lua --with-luajit}
   puts
   puts
diff --git a/zsh/config/zshenv b/zsh/config/zshenv
index c60db8c..d1acc16 100644
--- a/zsh/config/zshenv
+++ b/zsh/config/zshenv
@@ -72,6 +72,6 @@ if [[ -d "$TMPDIR" ]]; then
 fi
 
 # Java & Maven
-export JAVA_OPTS="-Xms2048m -Xmx2048m -XX:MaxPermSize=512m -XX:PermSize=512m"
+export JAVA_OPTS="-Xms2048m -Xmx2048m -XX:MaxPermSize=512m -XX:PermSize=512m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+UseCodeCacheFlushing"
 export MAVEN_OPTS=$JAVA_OPTS
-export JAVA_HOME=$(/usr/libexec/java_home)
+export JAVA_HOME=$(/usr/libexec/java_home -v '1.7*')
diff --git a/zsh/z.zsh b/zsh/z.zsh
new file mode 100644
index 0000000..e463630
--- /dev/null
+++ b/zsh/z.zsh
@@ -0,0 +1 @@
+. `brew --prefix`/etc/profile.d/z.sh