diff --git a/.gitignore b/.gitignore
index d3e70aae2..cfb24fbbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ stcli.exe
 *.sublime*
 discosrv
 stpidx
-.jshintrc
\ No newline at end of file
+.jshintrc
+coverage.out
diff --git a/.travis.yml b/.travis.yml
index 69a3ee5b8..f13a331a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,8 @@ script:
    - ./build.sh test-cov
 
 after_success:
-   - goveralls -coverprofile=acc.out -service=travis-ci
+   - goveralls -coverprofile=coverage.out -service=travis-ci -package=calmh/syncthing -repotoken="$COVERALS_TOKEN"
+
+env:
+   global:
+      secure: "zEV2h2XtKHNLVdXJjM4LA/VjMfLVydm6goF+ARit+nOSGxGoH7f7jIdzJzhxgh7shKG93q61eLO1Tug+WBMYB2EpBuYnTB5AIMYhCDwNI8C4uBV6c3brHfcrie7MASNao8TID2QScASKNFFWvjv/i1Ccn5ztxdcQuhSsNjGZp8A="
diff --git a/build.sh b/build.sh
index 8a2befc86..0d06aefb6 100755
--- a/build.sh
+++ b/build.sh
@@ -32,20 +32,16 @@ assets() {
 }
 
 test-cov() {
-   echo "mode: set" > acc.out
-   fail=0
+	echo "mode: set" > coverage.out
+	fail=0
 
-   for dir in $(find . -maxdepth 10 -not -path './.git*' -not -path '*/integration' -not -path '*/_*' -type d);
-   do
-   if ls $dir/*.go &> /dev/null; then
-   godep go test -coverprofile=profile.out $dir || fail=1
-       if [ -f profile.out ]
-       then
-   cat profile.out | grep -v "mode: set" >> acc.out
-         rm profile.out
-       fi
-   fi
-   done
+	for dir in $(go list ./...) ; do
+		godep go test -coverprofile=profile.out $dir || fail=1
+		if [ -f profile.out ] ; then
+			grep -v "mode: set" profile.out >> coverage.out
+		rm profile.out
+        fi
+    done
 
    exit $fail
 }
@@ -80,7 +76,8 @@ zipDist() {
 	rm -rf "$name"
 	mkdir -p "$name"
 	for f in "${distFiles[@]}" ; do
-		sed 's/$/
/' < "$f" > "$name/$f.txt"
+		sed 's/$/
+/' < "$f" > "$name/$f.txt"
 	done
 	cp syncthing.exe "$name"
 	sign "$name/syncthing.exe"