diff --git a/common/ChangeLog b/common/ChangeLog
index d9964c1fc..ea1d196cc 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-28  Werner Koch  <wk@gnupg.org>
+
+	* maperror.c (map_to_assuan_status): Map more errorcodes to Bad
+	Certificate.
+
 2002-06-26  Werner Koch  <wk@gnupg.org>
 
 	* maperror.c (map_to_assuan_status): Map EOF to No_Data_Available.
diff --git a/common/maperror.c b/common/maperror.c
index c982965d8..5e3fecd49 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -202,6 +202,12 @@ map_to_assuan_status (int rc)
     case 0: break;
     case GNUPG_Bad_CA_Certificate: 
     case GNUPG_Bad_Certificate:  
+    case GNUPG_Wrong_Key_Usage:
+    case GNUPG_Certificate_Revoked:
+    case GNUPG_No_CRL_Known:
+    case GNUPG_CRL_Too_Old:
+    case GNUPG_No_Policy_Match:
+    case GNUPG_Certificate_Expired:
       rc = ASSUAN_Bad_Certificate; 
       break;
     case GNUPG_Bad_Certificate_Path: rc = ASSUAN_Bad_Certificate_Path; break;