diff --git a/lint.sh b/lint.sh
index d025e14e..5be18dd8 100755
--- a/lint.sh
+++ b/lint.sh
@@ -5,5 +5,10 @@ set -e
 pkgs="./libpiper/... ./sshpiperd/..."
 
 gofmt -s -l libpiper sshpiperd
-go vet $pkgs
-golint $pkgs
+
+go vet ./...
+go fix ./...
+
+for p in $pkgs; do
+    golint $p
+done