diff --git a/sm/Makefile.am b/sm/Makefile.am
index efbceb6de..5c137fbb8 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -40,7 +40,7 @@ gpgsm_SOURCES = \
 	certdump.c \
 	certcheck.c \
 	certchain.c \
-	keylist.ccvs ta \
+	keylist.c \
 	verify.c \
 	sign.c \
 	encrypt.c \
diff --git a/sm/certchain.c b/sm/certchain.c
index 73f75764d..8ebd8c023 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -530,7 +530,7 @@ gpgsm_validate_chain (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
           if (gpgsm_check_cert_sig (subject_cert, subject_cert) )
             {
               log_error ("selfsigned certificate has a BAD signatures\n");
-              rc = depth? GNUPG_Bad_Certificate_Path : GNUPG_Bad_Certificate;
+              rc = depth? GNUPG_Bad_Certificate_Chain : GNUPG_Bad_Certificate;
               goto leave;
             }
           rc = allowed_ca (subject_cert, NULL);
@@ -577,7 +577,7 @@ gpgsm_validate_chain (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
       if (depth > maxdepth)
         {
           log_error (_("certificate chain too long\n"));
-          rc = GNUPG_Bad_Certificate_Path;
+          rc = GNUPG_Bad_Certificate_Chain;
           goto leave;
         }
 
@@ -616,7 +616,7 @@ gpgsm_validate_chain (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
       if (gpgsm_check_cert_sig (issuer_cert, subject_cert) )
         {
           log_error ("certificate has a BAD signatures\n");
-          rc = GNUPG_Bad_Certificate_Path;
+          rc = GNUPG_Bad_Certificate_Chain;
           goto leave;
         }
 
@@ -637,7 +637,7 @@ gpgsm_validate_chain (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
       rc = gpgsm_cert_use_cert_p (issuer_cert);
       if (rc)
         {
-          gpgsm_status2 (ctrl, STATUS_ERROR, "certpath.issuer.keyusage",
+          gpgsm_status2 (ctrl, STATUS_ERROR, "certcert.issuer.keyusage",
                          gnupg_error_token (rc), NULL);
           rc = 0;
         }
diff --git a/sm/verify.c b/sm/verify.c
index 524e7b227..ba509f464 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -443,7 +443,7 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd, FILE *out_fp)
       if (rc) /* of validate_chain */
         {
           log_error ("invalid certification chain: %s\n", gnupg_strerror (rc));
-          if (rc == GNUPG_Bad_Certificate_Path
+          if (rc == GNUPG_Bad_Certificate_Chain
               || rc == GNUPG_Bad_Certificate
               || rc == GNUPG_Bad_CA_Certificate
               || rc == GNUPG_Certificate_Revoked)