diff --git a/build b/build
index 15564240..af03fa07 100755
--- a/build
+++ b/build
@@ -1,12 +1,8 @@
 #!/bin/bash -e
 
 # allow builds outside the standard GOPATH via symlink
-export GOPATH=${PWD}/Godeps/_workspace
+export GOPATH=${PWD}/Godeps/_workspace:$GOPATH
 export GOBIN=${PWD}/bin
 
-mkdir -p $GOPATH/src/github.com/coreos
-# directory or symlink must be present
-[ -d $GOPATH/src/github.com/coreos/coreos-baremetal ] || ln -s ${PWD} $GOPATH/src/github.com/coreos/coreos-baremetal
-
 LD_FLAGS="-w -X main.version=$(./git-version)"
 CGO_ENABLED=0 go build -o bin/bootcfg -ldflags "$LD_FLAGS" -a -tags netgo github.com/coreos/coreos-baremetal/cmd/bootcfg