diff --git a/.zshrc b/.zshrc
index 41f4805..e1885f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,13 +5,15 @@ export EDITOR=vim
 #export TERM="screen-256color"
 bindkey -e
 
-export JAVA_HOME=/usr/local/jdk1.8.0_131/
+export JAVA_HOME=/usr/local/jdk1.8.0_131
 export PATH="$PATH:$JAVA_HOME/bin/"
 
 export NODE_HOME=/usr/local/node-v6.11.4-linux-64/
 export PATH="$NODE_HOME/bin/:$PATH"
 
 export PATH="$PATH:$HOME/phabricator/arcanist/bin/"
+export ANDROID_HOME="$HOME/Android/Sdk"
+export PATH="$PATH:$ANDROID_HOME/bin/"
 
 if [[ -d ~/.pyenv ]]; then
     # pyenv
@@ -28,6 +30,11 @@ if [[ -d ~/.rbenv/ ]]; then
     export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"
 fi
 
+if [[ -d /usr/local/go ]]; then
+    export PATH="$PATH:/usr/local/go/bin"
+    export GOROOT="/usr/local/go"
+fi
+
 # Path to your oh-my-zsh installation.
 # export ZSH=$HOME/.oh-my-zsh