diff --git a/.lintignore b/.lintignore
index 3403a0d1..8a9c0f18 100644
--- a/.lintignore
+++ b/.lintignore
@@ -1,8 +1,28 @@
 # IMPORTANT: Please only use GLOBs to ignore files and directories.
 
-# Do not lint any bash script in Weave Net, in order to 
+# Do not lint the below bash scripts in Weave Net, in order to 
 # avoid breaking the build on make lint:
-*.sh
-bin/*
+bin/circle-dependencies-post
+bin/circle-deploy-issues
+bin/circle-deploy-master
+bin/circle-teardown-pre
+bin/circle-test-teardown
+bin/circle-test-unit
+bin/install-wordepress
+bin/multiweave
+bin/publish-site
+bin/release
+build/build.sh
+prog/weave-kube/launch.sh
 prog/weaveexec/symlink
+test/*_test.sh
+test/600_proxy_docker_py.sh
+test/assert.sh
+test/config.sh
+test/gce.sh
+test/gen_coverage_reports.sh
+test/run_all.sh
+test/sanity_check.sh
+test/setup.sh
+vendor/*.sh
 weave
diff --git a/build/Dockerfile b/build/Dockerfile
index aa8a16f9..fb17b69e 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -45,6 +45,7 @@ RUN apt-get update \
 RUN go get \
 	github.com/golang/lint/golint \
 	github.com/fzipp/gocyclo \
+	gopkg.in/mvdan/sh.v1/cmd/shfmt \
 	github.com/client9/misspell/cmd/misspell
 
 # First clean, because we're gonna rebuild the std both with -race enabled and disabled