diff --git a/lib/ckfw/builtins/certdata.txt b/lib/ckfw/builtins/certdata.txt
index c0a3e05355..19bd1b0ddd 100644
--- a/lib/ckfw/builtins/certdata.txt
+++ b/lib/ckfw/builtins/certdata.txt
@@ -2328,7 +2328,10 @@ CKA_VALUE MULTILINE_OCTAL
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+# For Email Distrust After: Mon Mar 01 00:00:00 2021
+CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
+\062\061\060\063\060\061\060\060\060\060\060\060\132
+END
 
 # Trust for Certificate "Camerfirma Chambers of Commerce Root"
 # Issuer: CN=Chambers of Commerce Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU
@@ -2490,7 +2493,10 @@ CKA_VALUE MULTILINE_OCTAL
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+# For Email Distrust After: Mon Mar 01 00:00:00 2021
+CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
+\062\061\060\063\060\061\060\060\060\060\060\060\132
+END
 
 # Trust for Certificate "Camerfirma Global Chambersign Root"
 # Issuer: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU