diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index 4afb0ca5c..3f16d6996 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -558,14 +558,14 @@ krb5_cc_get_full_name(krb5_context context,
     type = krb5_cc_get_type(context, id);
     if (type == NULL) {
 	krb5_set_error_message(context, KRB5_CC_UNKNOWN_TYPE,
-			       "cache have no name of type");
+			       "cache has no name of type");
 	return KRB5_CC_UNKNOWN_TYPE;
     }
 
     name = krb5_cc_get_name(context, id);
     if (name == NULL) {
 	krb5_set_error_message(context, KRB5_CC_BADNAME,
-			       "cache of type %s have no name", type);
+			       "cache of type %s has no name", type);
 	return KRB5_CC_BADNAME;
     }
 
diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c
index ba7e13225..d1258683f 100644
--- a/lib/krb5/crypto.c
+++ b/lib/krb5/crypto.c
@@ -3208,7 +3208,7 @@ krb5_keytype_to_enctypes (krb5_context context,
     }
     if (n == 0) {
 	krb5_set_error_message(context, KRB5_PROG_KEYTYPE_NOSUPP,
-			       "Keytype have no mapping");
+			       "Keytype has no mapping");
 	return KRB5_PROG_KEYTYPE_NOSUPP;
     }
 
diff --git a/lib/krb5/digest.c b/lib/krb5/digest.c
index 7be249253..cc37c6d8e 100644
--- a/lib/krb5/digest.c
+++ b/lib/krb5/digest.c
@@ -347,7 +347,7 @@ digest_request(krb5_context context,
 	if (key == NULL) {
 	    ret = EINVAL;
 	    krb5_set_error_message(context, ret,
-				   N_("Digest reply have no remote subkey", ""));
+				   N_("Digest reply has no remote subkey", ""));
 	    goto out;
 	}
 
diff --git a/lib/krb5/krb5_err.et b/lib/krb5/krb5_err.et
index 1a64c14a4..1bea8f11b 100644
--- a/lib/krb5/krb5_err.et
+++ b/lib/krb5/krb5_err.et
@@ -106,7 +106,7 @@ error_code PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED, "Public key encryption not suppo
 #index 85
 #prefix KRB5_IAKERB
 #error_code ERR_KDC_NOT_FOUND,	"IAKERB proxy could not find a KDC"
-#error_code ERR_KDC_NO_RESPONSE,	"IAKERB proxy never reeived a response from a KDC"
+#error_code ERR_KDC_NO_RESPONSE,	"IAKERB proxy never received a response from a KDC"
 
 index 91
 error_code MORE_PREAUTH_DATA_REQUIRED, "More pre-authentication data required"
diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 557581a43..1b34c18ab 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -886,7 +886,7 @@ pk_verify_sign(krb5_context context,
     ret = hx509_get_one_cert(context->hx509ctx, signer_certs, &(*signer)->cert);
     if (ret) {
 	pk_copy_error(context, context->hx509ctx, ret,
-		      "Failed to get on of the signer certs");
+		      "Failed to get one of the signer certs");
 	goto out;
     }
 
@@ -1086,7 +1086,7 @@ pk_verify_host(krb5_context context,
 	    ret = KRB5_KDC_ERR_INVALID_CERTIFICATE;
 	    /* XXX: Lost in translation... */
 	    krb5_set_error_message(context, ret,
-				   N_("KDC have wrong realm name in "
+				   N_("KDC has wrong realm name in "
 				      "the certificate", ""));
 	}
     }
@@ -1929,7 +1929,7 @@ _krb5_pk_load_id(krb5_context context,
 	ret = hx509_revoke_init(context->hx509ctx, &id->revokectx);
 	if (ret) {
 	    pk_copy_error(context, context->hx509ctx, ret,
-			  "Failed init revoke list");
+			  "Failed to init revoke list");
 	    goto out;
 	}
 
@@ -1939,7 +1939,7 @@ _krb5_pk_load_id(krb5_context context,
 				       *revoke_list);
 	    if (ret) {
 		pk_copy_error(context, context->hx509ctx, ret,
-			      "Failed load revoke list");
+			      "Failed to load revoke list");
 		goto out;
 	    }
 	    revoke_list++;
@@ -1950,7 +1950,7 @@ _krb5_pk_load_id(krb5_context context,
     ret = hx509_verify_init_ctx(context->hx509ctx, &id->verify_ctx);
     if (ret) {
 	pk_copy_error(context, context->hx509ctx, ret,
-		      "Failed init verify context");
+		      "Failed to init verify context");
 	goto out;
     }
 
@@ -2079,7 +2079,7 @@ _krb5_parse_moduli_line(krb5_context context,
     m1->bits = atoi(p1);
     if (m1->bits == 0) {
 	krb5_set_error_message(context, ret,
-			       N_("moduli file %s have un-parsable "
+			       N_("moduli file %s has un-parsable "
 				  "bits on line %d", ""), file, lineno);
 	goto out;
     }
@@ -2293,7 +2293,7 @@ _krb5_dh_group_ok(krb5_context context, unsigned long bits,
 		    krb5_set_error_message(context,
 					   KRB5_KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED,
 					   N_("PKINIT: DH group parameter %s "
-					      "no accepted, not enough bits "
+					      "not accepted, not enough bits "
 					      "generated", ""),
 					   moduli[i]->name);
 		    return KRB5_KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED;
@@ -2305,7 +2305,7 @@ _krb5_dh_group_ok(krb5_context context, unsigned long bits,
     }
     krb5_set_error_message(context,
 			   KRB5_KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED,
-			   N_("PKINIT: DH group parameter no ok", ""));
+			   N_("PKINIT: DH group parameter not ok", ""));
     return KRB5_KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED;
 }
 #endif /* PKINIT */
diff --git a/po/heimdal_krb5/de.po b/po/heimdal_krb5/de.po
index e7e8a1dea..037cc46c1 100644
--- a/po/heimdal_krb5/de.po
+++ b/po/heimdal_krb5/de.po
@@ -391,7 +391,7 @@ msgstr "Auswerten der Digest-Antwort fehlgeschlagen"
 
 # FIXME s/have/has/ or s/reply/replys/
 #: lib/krb5/digest.c:365
-msgid "Digest reply have no remote subkey"
+msgid "Digest reply has no remote subkey"
 msgstr "Digest-Antwort hat keinen fernen Unterschlüssel."
 
 #: lib/krb5/digest.c:385
diff --git a/po/heimdal_krb5/heimdal_krb5.pot b/po/heimdal_krb5/heimdal_krb5.pot
index 3edacd2c2..9dbaaaf72 100644
--- a/po/heimdal_krb5/heimdal_krb5.pot
+++ b/po/heimdal_krb5/heimdal_krb5.pot
@@ -609,7 +609,7 @@ msgid "Failed to parse digest response"
 msgstr ""
 
 #: lib/krb5/digest.c:365
-msgid "Digest reply have no remote subkey"
+msgid "Digest reply has no remote subkey"
 msgstr ""
 
 #: lib/krb5/digest.c:385
diff --git a/po/heimdal_krb5/sv_SE.po b/po/heimdal_krb5/sv_SE.po
index f9721845a..ffd1ca7c8 100644
--- a/po/heimdal_krb5/sv_SE.po
+++ b/po/heimdal_krb5/sv_SE.po
@@ -600,7 +600,7 @@ msgid "Failed to parse digest response"
 msgstr ""
 
 #: lib/krb5/digest.c:363
-msgid "Digest reply have no remote subkey"
+msgid "Digest reply has no remote subkey"
 msgstr ""
 
 #: lib/krb5/digest.c:383