diff --git a/spring-security-x509/keystore/Makefile b/spring-security-x509/keystore/Makefile
index 5321be9de3..63498fea76 100644
--- a/spring-security-x509/keystore/Makefile
+++ b/spring-security-x509/keystore/Makefile
@@ -85,4 +85,4 @@ add-client:
 
 clean:
 	# Remove generated artifacts
-	find . ! -name Makefile -type f -exec rm -f {} \;
+	find . \( -name "$(CLIENTNAME)*" -o -name "$(HOSTNAME)*" -o -name "$(KEYSTORE)" -o -name "$(TRUSTSTORE)" -o -name ca.crt \) -type f -exec rm -f {} \;