diff --git a/Makefile b/Makefile
index 8f2b89b..33cbde0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,8 @@ lint:
 	go vet ./...
 	staticcheck -f stylish ./...
 	shellcheck $(SCRIPTS)
+	shfmt $(SCRIPTS)
+	git diff --exit-code
 
 .INTERMEDIATE: coverage.out
 coverage.out: $(GODEPS)
diff --git a/release b/release
index b932ef2..92792e7 100755
--- a/release
+++ b/release
@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-_err(){ >&2 echo "ERROR: $*"; exit 1; }
+_err() {
+    echo >&2 "ERROR: $*"
+    exit 1
+}
 
 git status --porcelain | grep -q "" &&
     _err "working tree is dirty, commit your changes first."
 
-[[ "$1" =~ ^v([0-9]+)\.([0-9]+)(\.([0-9]+))?(-rc([0-9]+))?$ ]] || \
+[[ "$1" =~ ^v([0-9]+)\.([0-9]+)(\.([0-9]+))?(-rc([0-9]+))?$ ]] ||
     _err "arg1 accepts the following formats: v1.0 v1.0.0 v1.0-rc1 v1.0.1-rc1"
 
 git tag | grep -q "^$1$" &&