diff --git a/go.json b/go.json
index 9d1bb4dd68..48be637ae3 100644
--- a/go.json
+++ b/go.json
@@ -5,13 +5,15 @@
     "persist": "go",
     "extract_dir": "go",
     "env_set": {
-        "GOROOT": "$dir",
-        "GOPATH": "$persist_dir\\go"
+        "GOROOT": "$dir"
+    },
+    "env_add_path": "bin",
+    "installer": {
+        "script": "add_first_in_path \"$env:USERPROFILE\\go\\bin\" $global"
+    },
+    "uninstaller": {
+        "script": "remove_from_path \"$env:USERPROFILE\\go\\bin\" $global"
     },
-    "env_add_path": [
-        "bin",
-        "go\\bin"
-    ],
     "architecture": {
         "64bit": {
             "url": "https://storage.googleapis.com/golang/go1.9.2.windows-amd64.zip",
@@ -38,7 +40,7 @@
     },
     "notes": "
         Your GOROOT has been set to: $dir
-        Your GOPATH has been set to: $persist_dir\\go
-        You can run 'go env GOPATH' or 'go env GOROOT' to view these at any time.
+        You can run 'go env GOROOT' to view this at any time.
+        \"$env:USERPROFILE\\go\\bin)\" has been added to your PATH.
     "
 }