diff --git a/admin/ank.c b/admin/ank.c
index a2cd145d9..c9a24914c 100644
--- a/admin/ank.c
+++ b/admin/ank.c
@@ -52,7 +52,7 @@ doit2(HDB *db, hdb_entry *ent, int mod)
     ret = db->fetch(context, db, ent);
     
     switch(ret){
-    case KRB5_HDB_NOENTRY:
+    case HDB_ERR_NOENTRY:
 	if(mod){
 	    fprintf(stderr, "Entry not found in database\n");
 	    return;
diff --git a/admin/get.c b/admin/get.c
index 3b3cab6af..41a6fdc7f 100644
--- a/admin/get.c
+++ b/admin/get.c
@@ -63,7 +63,7 @@ get_entry(int argc, char **argv)
     ret = db->fetch(context, db, &ent);
     
     switch(ret){
-    case KRB5_HDB_NOENTRY:
+    case HDB_ERR_NOENTRY:
 	fprintf(stderr, "Entry not found in database\n");
 	break;
     case 0: {
diff --git a/admin/init.c b/admin/init.c
index 209e6bc2d..ab3c4cde4 100644
--- a/admin/init.c
+++ b/admin/init.c
@@ -101,7 +101,7 @@ init(int argc, char **argv)
 	    fprintf(stderr, "Entry already exists\n");
 	    krb5_free_principal(context, ent.principal);
 	    continue;
-	case KRB5_HDB_NOENTRY:
+	case HDB_ERR_NOENTRY:
 	    break;
 	default:
 	    warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
diff --git a/kadmin/init.c b/kadmin/init.c
index 209e6bc2d..ab3c4cde4 100644
--- a/kadmin/init.c
+++ b/kadmin/init.c
@@ -101,7 +101,7 @@ init(int argc, char **argv)
 	    fprintf(stderr, "Entry already exists\n");
 	    krb5_free_principal(context, ent.principal);
 	    continue;
-	case KRB5_HDB_NOENTRY:
+	case HDB_ERR_NOENTRY:
 	    break;
 	default:
 	    warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index cdac58829..26ec00d5a 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -243,7 +243,7 @@ change (krb5_context context,
     ret = db->fetch (context, db, &ent);
     
     switch (ret) {
-    case KRB5_HDB_NOENTRY:
+    case HDB_ERR_NOENTRY:
 	syslog (LOG_ERR, "not found in database");
 	reply_priv (context, auth_context, s, addr, 2,
 		    "entry not found in database");