diff --git a/shell/go b/shell/go
index 460c043..824a0f2 100644
--- a/shell/go
+++ b/shell/go
@@ -45,10 +45,12 @@ _strip-go-path() {
 
 _set-gopath() {
   export GOPATH="$*"
+  export GOBIN="$GOPATH/bin"
 }
 
 _unset-gopath() {
   unset GOPATH
+  unset GOBIN
 }
 
 _gopath() {