diff --git a/assuan/assuan.h b/assuan/assuan.h
index 35a693bd1..477e2ded9 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -85,6 +85,7 @@ typedef enum {
   ASSUAN_Cert_Revoked = 301,
   ASSUAN_No_CRL_For_Cert = 302,
   ASSUAN_CRL_Too_Old = 303,
+  ASSUAN_Not_Trusted = 304,
 
 } AssuanError;
 
diff --git a/common/ChangeLog b/common/ChangeLog
index a72760275..6e987a94e 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-15  Werner Koch  <wk@gnupg.org>
+
+	* maperror.c: Add mapping for Not_Trusted. 
+
 2002-01-11  Werner Koch  <wk@gnupg.org>
 
 	* maperror.c (map_assuan_err): Codes for CRL
diff --git a/common/errors.h b/common/errors.h
index 56324959a..33ccbba29 100644
--- a/common/errors.h
+++ b/common/errors.h
@@ -74,6 +74,8 @@ enum {
   GNUPG_Certificate_Revoked = 45,
   GNUPG_No_CRL_Known = 46,
   GNUPG_CRL_Too_Old = 47,
+  GNUPG_Line_Too_Long = 48,
+  GNUPG_Not_Trusted = 49,
 };
 
 /* Status codes - fixme: should go into another file */
diff --git a/common/maperror.c b/common/maperror.c
index ba3a84b5f..348b473ec 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -144,6 +144,9 @@ map_assuan_err (int err)
     case ASSUAN_No_CRL_For_Cert: err = GNUPG_No_CRL_Known; break;       
     case ASSUAN_CRL_Too_Old:     err = GNUPG_CRL_Too_Old; break;        
 
+    case ASSUAN_Not_Trusted:     err = GNUPG_Not_Trusted; break;
+
+
     default:
       err = err < 100? GNUPG_Assuan_Server_Fault : GNUPG_Assuan_Error;
       break;
@@ -170,6 +173,7 @@ map_to_assuan_status (int rc)
     case GNUPG_No_Secret_Key:     rc = ASSUAN_No_Secret_Key; break;
     case GNUPG_Invalid_Data:      rc = ASSUAN_Invalid_Data; break;
     case GNUPG_Invalid_Name:      rc = ASSUAN_Invalid_Name; break;
+    case GNUPG_Not_Trusted:       rc = ASSUAN_Not_Trusted; break;
 
     case GNUPG_Bad_PIN:
     case GNUPG_Bad_Passphrase: