diff --git a/Makefile b/Makefile
index 8bf0445d1..170d64a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,7 @@ tests: $(SCOPE_BACKEND_BUILD_UPTODATE)
 
 lint: $(SCOPE_BACKEND_BUILD_UPTODATE)
 	./tools/lint -ignorespelling "agre " -ignorespelling "AGRE " .
+	./tools/shell-lint tools
 
 prog/static.go: $(SCOPE_BACKEND_BUILD_UPTODATE)
 	esc -o $@ -prefix client/build client/build
diff --git a/backend/Dockerfile b/backend/Dockerfile
index e809ba719..a6718ed66 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.6.2
 RUN apt-get update && \
-	apt-get install -y libpcap-dev python-requests time file && \
+	apt-get install -y libpcap-dev python-requests time file shellcheck && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN go clean -i net && \
 	go install -tags netgo std && \