diff --git a/.gitignore b/.gitignore
index fcf20b78c..d575ed404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 dist/
 vendor
-goreleaser
-!cmd/goreleaser
-.glide/
-coverage.out
+coverage.txt
diff --git a/.travis.yml b/.travis.yml
index fdc47ca62..c2c229d89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@ script:
   - make test
   - test -n "$TRAVIS_TAG" || go run ./cmd/goreleaser/main.go --skip-validate --skip-publish
 after_success:
-  - go get github.com/mattn/goveralls
-  - goveralls -coverprofile=coverage.out -service=travis-ci -repotoken="$COVERALLS_TOKEN"
+  - bash <(curl -s https://codecov.io/bash)
   - test -n "$TRAVIS_TAG" && go run ./cmd/goreleaser/main.go
 notifications:
   email: false
diff --git a/Makefile b/Makefile
index 8c00c3b65..99e274731 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@ setup: ## Install all the build and lint dependencies
 	gometalinter --install
 
 test: ## Run all the tests
-	gotestcover $(TEST_OPTIONS) -covermode=count -coverprofile=coverage.out $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=30s
+	gotestcover $(TEST_OPTIONS) -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=30s
 
 cover: test ## Run all the tests and opens the coverage report
-	go tool cover -html=coverage.out
+	go tool cover -html=coverage.txt
 
 fmt: ## gofmt and goimports all go files
 	find . -name '*.go' -not -wholename './vendor/*' | while read -r file; do gofmt -w -s "$$file"; goimports -w "$$file"; done
diff --git a/README.md b/README.md
index 085382f2d..f815a0d20 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ We appreciate your contribution. Please refer to our [contributing guidelines](C
 [![Release](https://img.shields.io/github/release/goreleaser/goreleaser.svg?style=flat-square)](https://github.com/goreleaser/goreleaser/releases/latest)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
 [![Travis](https://img.shields.io/travis/goreleaser/goreleaser.svg?style=flat-square)](https://travis-ci.org/goreleaser/goreleaser)
-[![Coverage Status](https://img.shields.io/coveralls/goreleaser/goreleaser/master.svg?style=flat-square)](https://coveralls.io/github/goreleaser/goreleaser?branch=master)
+[![Codecov branch](https://img.shields.io/codecov/c/github/goreleaser/goreleaser/master.svg?style=flat-square)](https://codecov.io/gh/goreleaser/goreleaser)
 [![Go Report Card](https://goreportcard.com/badge/github.com/goreleaser/goreleaser?style=flat-square)](https://goreportcard.com/report/github.com/goreleaser/goreleaser)
-[![](https://godoc.org/github.com/goreleaser/goreleaser?status.svg&style=flat-square)](http://godoc.org/github.com/goreleaser/goreleaser)
+[![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](http://godoc.org/github.com/goreleaser/goreleaser)
 [![SayThanks.io](https://img.shields.io/badge/SayThanks.io-%E2%98%BC-1EAEDB.svg?style=flat-square)](https://saythanks.io/to/caarlos0)
 [![Powered By: GoReleaser](https://img.shields.io/badge/powered%20by-goreleaser-green.svg?style=flat-square)](https://github.com/goreleaser)
 
diff --git a/cmd/goreleaser/main.go b/cmd/goreleaser/main.go
index e327bcf61..b5cf50996 100644
--- a/cmd/goreleaser/main.go
+++ b/cmd/goreleaser/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"os"
 
@@ -17,7 +18,7 @@ var (
 func main() {
 	var app = cli.NewApp()
 	app.Name = "goreleaser"
-	app.Version = version + ", commit " + commit + ", built at " + date
+	app.Version = fmt.Sprintf("%v, commit %v, built at %v", version, commit, date)
 	app.Usage = "Deliver Go binaries as fast and easily as possible"
 	app.Flags = []cli.Flag{
 		cli.StringFlag{