diff --git a/Makefile b/Makefile
index 69417bcb547514866fbb07d1e27cfb8ecca561db..fe7445bcfa7d963c56424009de093f41228d8391 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install clean test
+.PHONY: install clean test lint
 
 install:
 	cp ssl-ca /usr/local/bin/ssl-ca
@@ -8,7 +8,10 @@ clean:
 	if [ -f .server.pid ]; then kill "$$(cat .server.pid)"; fi
 	rm -rf openssl.cnf certs keys CA.key CA.crt CA.p12 CA.srl .server.pid
 
-test: clean
+lint:
+	/bin/sh -en ssl-ca
+
+test: clean lint
 	./ssl-ca init
 	test "$$(openssl rsa -noout -check -in CA.key)" = "RSA key ok"
 	test "$$(openssl verify -CAfile CA.crt CA.crt)" = "CA.crt: OK"
diff --git a/README.rst b/README.rst
index 944db712dbaef8c87c1792b69b58c14bd6f71ced..1a5d6ee96e61b6a9d9e76e8fb5977761a68117ae 100644
--- a/README.rst
+++ b/README.rst
@@ -68,8 +68,9 @@ other cert on the internet.
 Development
 -----------
 
-For easing devlopment :code:`make test` and :code:`make clean` are also provided
-(it's recommended to add :code:`make test` to the pre-push git 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
 -------