diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cf5c47..d07a262 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 * Don't penalize missing trust in rating when CA not in Java store
 * Added support for certificates with EdDSA signatures and pubilc keys
 * --add-ca can also now be a directory with \*.pem files
+* Warning of 398 day limit for certificates issued after 2020/9/1
 
 ### Features implemented / improvements in 3.0
 
diff --git a/CREDITS.md b/CREDITS.md
index 3c0cd24..a46bbe7 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -39,6 +39,9 @@ Full contribution, see git log.
 * Christoph Badura
   - NetBSD fixes
 
+* Jim Blankendaal
+  - maximum certificate lifespan of 398 days 
+
 * Frank Breedijk
   - Detection of insecure redirects
   - JSON and CSV output