diff --git a/dotfiles/zsh/exports.zsh b/dotfiles/zsh/exports.zsh
index b2fab00..b39bf31 100644
--- a/dotfiles/zsh/exports.zsh
+++ b/dotfiles/zsh/exports.zsh
@@ -27,7 +27,10 @@ export PATH="/usr/local/opt/openjdk/bin:$PATH"
 export HISTCONTROL=ignoredups
 
 # If go is installed, set the $GOPATH to the projects directory created above.
-if which go > /dev/null; then export GOPATH=$HOME/.go; fi
+if which go > /dev/null; then 
+export GOPATH=$HOME/.go
+export PATH=${PATH}:`go env GOPATH`/bin
+fi
 	
 if [ -d "$HOME/.rvm" ]; then
 	export PATH="$PATH:$HOME/.rvm/bin"
@@ -36,3 +39,15 @@ fi
 if [ -f "$HOME/.cargo/env" ]; then
 	. "$HOME/.cargo/env"
 fi
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  # Enable homebrew openssl support
+  export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
+  export PATH="/usr/local/opt/openjdk/bin:$PATH"
+  export PATH="/usr/local/opt/llvm/bin:$PATH"
+  export PATH="/usr/local/opt/qt/bin:$PATH"
+  export PATH="/usr/local/opt/tcl-tk/bin:$PATH"
+fi
+
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+
diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile
index 3fff494..6ef54a9 100644
--- a/dotfiles/zsh/zprofile
+++ b/dotfiles/zsh/zprofile
@@ -1,22 +1,2 @@
 #!/bin/zsh
 
-if [[ -f ~/.zshrc ]]; then
-  source ~/.zshrc
-fi
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  # Enable homebrew openssl support
-  export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
-  export PATH="/usr/local/opt/openjdk/bin:$PATH"
-  export PATH="/usr/local/opt/llvm/bin:$PATH"
-  export PATH="/usr/local/opt/qt/bin:$PATH"
-  export PATH="/usr/local/opt/tcl-tk/bin:$PATH"
-fi
-
-export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
-
-if [ -f "$HOME/.cargo/env" ]; then
-	. "$HOME/.cargo/env"
-fi
diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index 8faa05c..a9719aa 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -44,6 +44,11 @@ if [[ -x go ]]; then
   mkdir -p $HOME/.go
 fi
 
+test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+
+if [ -f "$HOME/.cargo/env" ]; then
+	. "$HOME/.cargo/env"
+fi
 
 # Install zsh completion in ~/.zsh if it doesn't exist
 if [[ ! -d $HOME/.zsh ]]; then