1 files changed, 4 insertions, 5 deletions
diff --git a/internal/build/util.go b/internal/build/util.go
index be41efed7..a821cd7f2 100644
--- a/internal/build/util.go
+++ b/internal/build/util.go
@@ -55,15 +55,14 @@ func GOPATH() string {
 	if len(path) == 0 {
 		log.Fatal("GOPATH is not set")
 	}
-	// Ensure Godeps workspace is present in the path.
-	godeps, _ := filepath.Abs(filepath.Join("Godeps", "_workspace"))
+	// Ensure that our internal vendor folder in on GOPATH
+	vendor, _ := filepath.Abs(filepath.Join("build", "_vendor"))
 	for _, dir := range path {
-		if dir == godeps {
+		if dir == vendor {
 			return strings.Join(path, string(filepath.ListSeparator))
 		}
 	}
-	newpath := append(path[:1], godeps)
-	newpath = append(newpath, path[1:]...)
+	newpath := append(path[:1], append([]string{vendor}, path[1:]...)...)
 	return strings.Join(newpath, string(filepath.ListSeparator))
 }