diff --git a/Makefile b/Makefile
index f3e73c9..a1dc559 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,17 @@ installdeps:
 	gom install
 
 build:
-	go build -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -v -o build/mailfull_$(GOOS)_$(GOARCH)/mailfull cmd/mailfull/main.go
+	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o build/mailfull_$(GOOS)_$(GOARCH)/mailfull cmd/mailfull/mailfull.go
 
 build-linux-amd64:
 	docker run --rm -v $(PWD):/go/src/github.com/directorz/mailfull-go -w /go/src/github.com/directorz/mailfull-go \
 	-e GOOS=linux -e GOARCH=amd64 golang:1.7 \
-	go build -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -v -o "build/mailfull_linux_amd64/mailfull" cmd/mailfull/main.go
+	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o "build/mailfull_linux_amd64/mailfull" cmd/mailfull/mailfull.go
 
 build-linux-386:
 	docker run --rm -v $(PWD):/go/src/github.com/directorz/mailfull-go -w /go/src/github.com/directorz/mailfull-go \
 	-e GOOS=linux -e GOARCH=386 golang:1.7 \
-	go build -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -v -o "build/mailfull_linux_386/mailfull" cmd/mailfull/main.go
+	go build -v -ldflags "-X main.gittag=`git rev-parse --short HEAD`" -o "build/mailfull_linux_386/mailfull" cmd/mailfull/mailfull.go
 
 release: release-linux-amd64 release-linux-386
 
diff --git a/cmd/mailfull/main.go b/cmd/mailfull/mailfull.go
similarity index 100%
rename from cmd/mailfull/main.go
rename to cmd/mailfull/mailfull.go