diff --git a/plugins/available/go.plugin.bash b/plugins/available/go.plugin.bash
old mode 100644
new mode 100755
index c9fcdff8..827ac388
--- a/plugins/available/go.plugin.bash
+++ b/plugins/available/go.plugin.bash
@@ -5,7 +5,7 @@ about-plugin 'go environment variables & path configuration'
 
 [ ! command -v go &>/dev/null ] && return
 
-export GOROOT=${GOROOT:-$(go env | grep GOROOT | cut -d'"' -f2)}
+export GOROOT=${GOROOT:-$(go env GOROOT)}
 pathmunge "${GOROOT}/bin"
-export GOPATH=${GOPATH:-"$HOME/go"}
+export GOPATH=${GOPATH:-$(go env GOPATH)}
 pathmunge "${GOPATH}/bin"