diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index fd22625..76d3e70 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -416,11 +416,13 @@ and initialize a fresh PKI here."
 				rm -rf "$EASYRSA_PKI" || die "Removal of PKI dir failed. Check/correct errors above"
 				;;
 			soft)
-				files="ca.crt certs_by_serial ecparams index.txt issued private reqs serial"
+				files="ca.crt certs_by_serial ecparams index.txt index.txt.attr index.txt.old issued private reqs serial serial.old"
 				for i in $files; do
 					rm -rf "$EASYRSA_PKI/$i" || die "Removal of PKI dir failed. Check/correct errors above"
 				done
 				;;
+			# More modes could be added here, e.g. only remove
+			# issued certs (and clean database), but keep CA intact.
 			*)
 				die "Removal of PKI dir failed. Unknown reset type."
 				;;