diff --git a/Makefile b/Makefile
index 9d3bfb04ef823ca9247c12a98dc5d70059de8da3..5ccf0199850e19806f6047e0dd7eab8d0f901cbe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install clean test
+.PHONY: install clean test lint
 
 
 sshd_config:
@@ -17,7 +17,10 @@ clean:
 	if [ -f sshd.pid ] && [ -d "/proc/$$(cat sshd.pid)" ]; then kill "$$(cat sshd.pid)"; fi
 	rm -rf CA CA.pub users hosts known_hosts sshd.pid sshd_config
 
-test: clean sshd_config
+lint:
+	/bin/sh -en ssh-ca
+
+test: clean sshd_config lint
 	./ssh-ca init
 	./ssh-ca newuser $$USER
 	./ssh-ca newhost localhost
diff --git a/README.rst b/README.rst
index 5b140d7d01146f5ffba60958ab758546eb2968ed..f2e7093a1e411644f4f6fea22e33b7661a69a64a 100644
--- a/README.rst
+++ b/README.rst
@@ -86,8 +86,9 @@ Authenticating users
 Development
 -----------
 
-To ease development :code:`make clean` and :code:`make test` are available.
-It's recommended to add :code:`make test` to your git pre-commit hook.
+To ease development :code:`make clean`, :code:`make lint` and :code:`make test`
+are available. It's recommended to add :code:`make lint`  and :code:`make test`
+to to your Git pre-commit and pre-push hooks accourdingly.
 
 License
 -------