diff --git a/.gitignore b/.gitignore
index 66eeedc5..206e5c22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bin/node-problem-detector
+/node-problem-detector
diff --git a/.travis.yml b/.travis.yml
index e9240e10..10172a02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,4 @@ install:
  - cd $HOME/gopath/src/k8s.io/node-problem-detector
 script:
  - make test
- - go build -race
+ - make node-problem-detector 
diff --git a/Makefile b/Makefile
index 5f4304e3..2ddaeac9 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,8 @@ PROJ = google_containers
 
 PKG_SOURCES := $(shell find pkg -name '*.go')
 
-node-problem-detector: ./bin/node-problem-detector
-
-./bin/node-problem-detector: $(PKG_SOURCES) node_problem_detector.go
-	CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o node-problem-detector
+node-problem-detector: $(PKG_SOURCES) node_problem_detector.go
+	GOOS=linux go build -ldflags '-w -extldflags "-static"' -o node-problem-detector
 
 test:
 	go test -timeout=1m -v -race ./pkg/...
@@ -24,4 +22,4 @@ push: container
 	gcloud docker push gcr.io/$(PROJ)/node-problem-detector:$(TAG)
 
 clean:
-	rm -f ./bin/node-problem-detector
+	rm -f node-problem-detector
diff --git a/bin/.gitkeep b/bin/.gitkeep
deleted file mode 100644
index e69de29b..00000000