diff --git a/Makefile b/Makefile
index 590eb0f91..eb89acc59 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ documentation: search_index
 	godoc -http=:6060 -index -index_files='search_index'
 
 format:
-	find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
+	find . -iname '*.go' | egrep -v "^./build/|generated|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
 
 model: dependencies preparation
 	$(MAKE) -C model
diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
index b8e253afd..db73a729b 100644
--- a/Makefile.INCLUDE
+++ b/Makefile.INCLUDE
@@ -38,7 +38,7 @@ GOCC		= $(GOROOT)/bin/go
 TMPDIR		= /tmp
 GOENV		= TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH)
 GO		= $(GOENV) $(GOCC)
-GOFMT		= $(GOENV) $(GOROOT)/bin/gofmt
+GOFMT		= $(GOROOT)/bin/gofmt
 
 LEVELDB_VERSION := 1.9.0
 PROTOCOL_BUFFERS_VERSION := 2.5.0