diff --git a/src/go/vendor/vendor.json b/src/go/vendor/vendor.json
new file mode 100644
index 00000000..82f9b049
--- /dev/null
+++ b/src/go/vendor/vendor.json
@@ -0,0 +1,203 @@
+{
+	"comment": "",
+	"ignore": "test",
+	"package": [
+		{
+			"checksumSHA1": "9NR0rrcAT5J76C5xMS4AVksS9o0=",
+			"path": "github.com/StackExchange/wmi",
+			"revision": "e54cbda6595d7293a7a468ccf9525f6bc8887f99",
+			"revisionTime": "2016-08-11T21:45:55Z"
+		},
+		{
+			"checksumSHA1": "wDZdTaY9JiqqqnF4c3pHP71nWmk=",
+			"path": "github.com/go-ole/go-ole",
+			"revision": "5e9c030faf78847db7aa77e3661b9cc449de29b7",
+			"revisionTime": "2016-11-16T06:46:58Z"
+		},
+		{
+			"checksumSHA1": "IvdiJE1NIogRmGi3WmteEKZQJB8=",
+			"path": "github.com/go-ole/go-ole/oleutil",
+			"revision": "5e9c030faf78847db7aa77e3661b9cc449de29b7",
+			"revisionTime": "2016-11-16T06:46:58Z"
+		},
+		{
+			"checksumSHA1": "JSHl8b3nI8EWvzm+uyrIqj2Hiu4=",
+			"path": "github.com/golang/mock/gomock",
+			"revision": "bd3c8e81be01eef76d4b503f5e687d2d1354d2d9",
+			"revisionTime": "2016-01-21T18:51:14Z"
+		},
+		{
+			"checksumSHA1": "EcZfls6vcqjasWV/nBlu+C+EFmc=",
+			"path": "github.com/hashicorp/go-version",
+			"revision": "e96d3840402619007766590ecea8dd7af1292276",
+			"revisionTime": "2016-10-31T18:26:05Z"
+		},
+		{
+			"checksumSHA1": "K6exl2ouL7d8cR2i378EzZOdRVI=",
+			"path": "github.com/howeyc/gopass",
+			"revision": "bf9dde6d0d2c004a008c27aaee91170c786f6db8",
+			"revisionTime": "2017-01-09T16:22:49Z"
+		},
+		{
+			"checksumSHA1": "0xjvz/KGzXhAFsnDRvzofE0xNzI=",
+			"path": "github.com/kylelemons/godebug/diff",
+			"revision": "d99083b96f422f8fd5a93bc02040acec769e178f",
+			"revisionTime": "2016-11-09T21:01:02Z"
+		},
+		{
+			"checksumSHA1": "ql0/7EZAK4Bbj1mkcj095UPfuK4=",
+			"path": "github.com/kylelemons/godebug/pretty",
+			"revision": "d99083b96f422f8fd5a93bc02040acec769e178f",
+			"revisionTime": "2016-11-09T21:01:02Z"
+		},
+		{
+			"checksumSHA1": "eW4R3odVrsAfyKbibRdUgGETfxc=",
+			"path": "github.com/montanaflynn/stats",
+			"revision": "f8cd06f93c6c1b06028caafb88b540fc820f77c1",
+			"revisionTime": "2016-11-02T19:40:25Z"
+		},
+		{
+			"checksumSHA1": "1sx4pWDNDmcRC/EQ3UslGEmfQa4=",
+			"path": "github.com/pborman/getopt",
+			"revision": "7148bc3a4c3008adfcab60cbebfd0576018f330b",
+			"revisionTime": "2017-01-12T20:04:14Z"
+		},
+		{
+			"checksumSHA1": "hbVBehxpieRKCCXrrO3greA8eow=",
+			"path": "github.com/percona/pmgo",
+			"revision": "20a7d7de024f754b59b6d51e8e3c21cf830299aa",
+			"revisionTime": "2017-02-01T04:03:13Z"
+		},
+		{
+			"checksumSHA1": "kTY8RZr5j26RNIR+F2SnMLeB7G8=",
+			"path": "github.com/percona/pmgo/pmgomock",
+			"revision": "20a7d7de024f754b59b6d51e8e3c21cf830299aa",
+			"revisionTime": "2017-02-01T04:03:13Z"
+		},
+		{
+			"path": "github.com/percona/toolkit-go-old/pt-mongodb-summary/test",
+			"revision": ""
+		},
+		{
+			"checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=",
+			"path": "github.com/pkg/errors",
+			"revision": "248dadf4e9068a0b3e79f02ed0a610d935de5302",
+			"revisionTime": "2016-10-29T09:36:37Z"
+		},
+		{
+			"checksumSHA1": "zmC8/3V4ls53DJlNTKDZwPSC/dA=",
+			"path": "github.com/satori/go.uuid",
+			"revision": "b061729afc07e77a8aa4fad0a2fd840958f1942a",
+			"revisionTime": "2016-09-27T10:08:44Z"
+		},
+		{
+			"checksumSHA1": "gtIX3Y1E+9A6IvgucPU92pWMSUw=",
+			"path": "github.com/shirou/gopsutil/cpu",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "74PIzS+la5td63oGs74K66mQ7hk=",
+			"path": "github.com/shirou/gopsutil/host",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "F4xYQ60JlmamCUSCJl7zuuq58Kw=",
+			"path": "github.com/shirou/gopsutil/internal/common",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "qwq9CA01ilJmO40FivIl6rvXsZc=",
+			"path": "github.com/shirou/gopsutil/mem",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "qAUkmVl5QdBPPc02diYp3qfTvGU=",
+			"path": "github.com/shirou/gopsutil/net",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "KxRUf6rK/uLsB25e28tbkKvobJ8=",
+			"path": "github.com/shirou/gopsutil/process",
+			"revision": "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58",
+			"revisionTime": "2017-01-30T15:34:44Z"
+		},
+		{
+			"checksumSHA1": "Nve7SpDmjsv6+rhkXAkfg/UQx94=",
+			"path": "github.com/shirou/w32",
+			"revision": "bb4de0191aa41b5507caa14b0650cdbddcd9280b",
+			"revisionTime": "2016-09-30T03:27:40Z"
+		},
+		{
+			"checksumSHA1": "9jFFVttlMr6qQ7e+IrcT20XmFQY=",
+			"path": "github.com/sirupsen/logrus",
+			"revision": "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d",
+			"revisionTime": "2017-01-13T01:19:11Z"
+		},
+		{
+			"checksumSHA1": "xiderUuvye8Kpn7yX3niiJg32bE=",
+			"path": "golang.org/x/crypto/ssh/terminal",
+			"revision": "dc137beb6cce2043eb6b5f223ab8bf51c32459f4",
+			"revisionTime": "2017-01-30T16:50:24Z"
+		},
+		{
+			"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
+			"path": "golang.org/x/net/context",
+			"revision": "f2499483f923065a842d38eb4c7f1927e6fc6e6d",
+			"revisionTime": "2017-01-14T04:22:49Z"
+		},
+		{
+			"checksumSHA1": "uTQtOqR0ePMMcvuvAIksiIZxhqU=",
+			"path": "golang.org/x/sys/unix",
+			"revision": "d75a52659825e75fff6158388dddc6a5b04f9ba5",
+			"revisionTime": "2016-12-14T18:38:57Z"
+		},
+		{
+			"checksumSHA1": "1D8GzeoFGUs5FZOoyC2DpQg8c5Y=",
+			"path": "gopkg.in/mgo.v2",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "YsB2DChSV9HxdzHaKATllAUKWSI=",
+			"path": "gopkg.in/mgo.v2/bson",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "58HoOoQzqGWh5E+SJfQw7/sPaZs=",
+			"path": "gopkg.in/mgo.v2/dbtest",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "XQsrqoNT1U0KzLxOFcAZVvqhLfk=",
+			"path": "gopkg.in/mgo.v2/internal/json",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "LEvMCnprte47qdAxWvQ/zRxVF1U=",
+			"path": "gopkg.in/mgo.v2/internal/sasl",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "+1WDRPaOphSCmRMxVPIPBV4aubc=",
+			"path": "gopkg.in/mgo.v2/internal/scram",
+			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
+			"revisionTime": "2016-08-18T02:01:20Z"
+		},
+		{
+			"checksumSHA1": "t95/FNK2nGCx3e6IARbO7OrcCuY=",
+			"path": "gopkg.in/tomb.v2",
+			"revision": "d5d1b5820637886def9eef33e03a27a9f166942c",
+			"revisionTime": "2016-12-08T15:16:19Z"
+		}
+	],
+	"rootPath": "github.com/percona/percona-toolkit/src/go"
+}
diff --git a/util/build-packages b/util/build-packages
index 08210ebe..b928a4bf 100755
--- a/util/build-packages
+++ b/util/build-packages
@@ -49,7 +49,7 @@ warn() {
 }
 
 cwd=$PWD
-PERCONA_TOOLKIT_BRANCH=${PERCONA_TOOLKIT_BRANCH:-""}
+PERCONA_TOOLKIT_BRANCH=$(git rev-parse --show-toplevel)
 if [ -n "$PERCONA_TOOLKIT_BRANCH" ]; then
    BRANCH=$PERCONA_TOOLKIT_BRANCH
    cd $BRANCH
@@ -438,7 +438,8 @@ build_go_binaries() {
    then
        echo "not in gopath"
        if [ -e ${TOOLKIT_DIR} ]; then
-           die "Cannot link current directory into GOPATH. Already exists"
+           echo "Cannot link current directory into GOPATH. Already exists" >&2
+           die "Please check/remove the ${TOOLKIT_DIR} directory"
        else
            mkdir -p ${PERCONA_DIR}
            ln -s ${BASE_DIR} ${PERCONA_DIR}
@@ -448,7 +449,7 @@ build_go_binaries() {
    echo "Building Go tools for $OS_ARCH ..."
    go get -u github.com/kardianos/govendor
    cd $GO_TOOLS_DIR
-   govendor fetch
+   govendor fetch +external
    make $OS_ARCH
    cd $CUR_DIR