diff --git a/home/.bash_env b/home/.bash_env
index a928130..49c52b3 100644
--- a/home/.bash_env
+++ b/home/.bash_env
@@ -1,4 +1,12 @@
-export PATH=$PATH:~/bin/scripts:~/bin
+export GOPATH=~/build/go/
+
+if [ -d ~/bin ]; then
+	export PATH=$PATH:~/bin/scripts:~/bin
+fi
+
+if [ -d $GOPATH/bin ]; then
+	export PATH=$PATH:$GOPATH/bin
+fi
 
 # OS X stuff if availabe
 if [[ "$OSTYPE" == "darwin"* ]]; then