diff --git a/Makefile b/Makefile
index 9cc72cee..8c9ddc6f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ export GOPATH:=$(CURDIR)/Godeps/_workspace
 .PHONY=dbuild
 
 all: $(RUNC_LINK)
-	go build -ldflags "-X main.gitCommit=${COMMIT}" -tags "$(BUILDTAGS)" -o runc .
+	go build -i -ldflags "-X main.gitCommit=${COMMIT}" -tags "$(BUILDTAGS)" -o runc .
 
 static: $(RUNC_LINK)
-	CGO_ENABLED=1 go build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT}" -o runc .
+	CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT}" -o runc .
 
 $(RUNC_LINK):
 	ln -sfn $(CURDIR) $(RUNC_LINK)
@@ -49,6 +49,7 @@ uninstall:
 clean:
 	rm -f runc
 	rm -f $(RUNC_LINK)
+	rm -rf $(GOPATH)/pkg
 
 validate:
 	script/validate-gofmt