diff --git a/.gitignore b/.gitignore
index e2a00dbd5635daf4d539aad9ed517de7179d3a4e..cee4e0cb47bf47c121cb463dc6e77a875eb94a00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 *~
 *.swp
 *.swo
-certs/*
-keys/*
+certs/
+keys/
 openssl.cnf
 CA.key
 CA.crt
diff --git a/Makefile b/Makefile
index 5b7a85b950e3be63d3597973b7861338a34de4d8..39e170bc8fdf9b32e6ae49b3b2680cb6046c8486 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install test
+.PHONY: install test clean
 
 install:
 	cp ssl-ca /usr/local/bin/ssl-ca
@@ -29,3 +29,6 @@ test:
 	test "$$(curl --fail --cacert CA.crt --resolve www.ssl-ca:4433:127.0.0.1 --write-out '%{ssl_verify_result}' --silent --output /dev/null https://www.ssl-ca:4433/)" = "0"
 	kill "$$(cat .server.pid)"
 	rm .server.pid
+
+clean:
+	git clean -Xdf