diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c809d35fd5..2b7676f79d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,6 +28,7 @@ This release includes the following bugfixes:
  o build: fix AIX compilation and usage of events/revents
  o VC Makefiles: add missing hostcheck
  o nss: clear session cache if a client certificate from file is used
+ o nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
 
 This release includes the following known bugs:
 
diff --git a/lib/nss.c b/lib/nss.c
index 5c9c11c5ff..8a2cb09e66 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1093,10 +1093,8 @@ static bool is_nss_error(CURLcode err)
   switch(err) {
   case CURLE_PEER_FAILED_VERIFICATION:
   case CURLE_SSL_CACERT:
-  case CURLE_SSL_CACERT_BADFILE:
   case CURLE_SSL_CERTPROBLEM:
   case CURLE_SSL_CONNECT_ERROR:
-  case CURLE_SSL_CRL_BADFILE:
   case CURLE_SSL_ISSUER_ERROR:
     return true;