diff --git a/admin/load.c b/admin/load.c
index d64e711d0..a4cfa2e30 100644
--- a/admin/load.c
+++ b/admin/load.c
@@ -2,30 +2,36 @@
 
 RCSID("$Id$");
 
+struct entry{
+    char *principal;
+    char *key;
+    char *kvno;
+    char *max_life;
+    char *max_renew;
+};
+
 int main(int argc, char **argv)
 {
     FILE *f;
-    DB *db;
+    HDB *db;
     krb5_context context;
     char s[1024];
     char *p;
     int line;
-    unsigned char key_buf[1024];
-    unsigned char *q;
-    unsigned char value_buf[1024];
-    krb5_keyblock keyblock;
-    DBT key, value;
     int err;
     int i;
-    krb5_storage *sp;
 
     struct entry e;
+    hdb_entry ent;
 
-    krb5_principal princ;
     
     krb5_init_context(&context);
     f = fopen(argv[1], "r");
-    db = dbopen(argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600, DB_BTREE, NULL);
+    err = hdb_open(context, &db, argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600);
+    if(err){
+	fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err));
+	exit(1);
+    }
     line = 0;
     while(fgets(s, sizeof(s), f)){
 	line++;
@@ -61,7 +67,7 @@ int main(int argc, char **argv)
 	    *p++;
 	*p++ = 0;
 
-	err = krb5_parse_name(context, e.principal, &princ);
+	err = krb5_parse_name(context, e.principal, &ent.principal);
 	if(err){
 	    fprintf(stderr, "%s:%s:%s (%s)\n", 
 		    argv[1], 
@@ -71,29 +77,17 @@ int main(int argc, char **argv)
 	    continue;
 	}
 	
-	sp = krb5_storage_from_mem(key_buf, sizeof(key_buf));
-	princ->type = 0;
-	krb5_store_principal(sp, princ);
-	key.data = key_buf;
-	key.size = sp->seek(sp, 0, SEEK_CUR);
-	krb5_storage_free(sp);
-
-	keyblock.keytype = KEYTYPE_DES;
-	keyblock.contents.data = malloc(strlen(e.key)/2+1);
+	ent.keyblock.keytype = KEYTYPE_DES;
+	ent.keyblock.contents.data = malloc(strlen(e.key)/2+1);
 	for(i = 0; i < strlen(e.key); i += 2){
 	    sscanf(e.key + i, "%2x", 
-		   (unsigned char *)keyblock.contents.data + (i/2));
+		   (unsigned char *)ent.keyblock.contents.data + (i/2));
 	}
-	keyblock.contents.length = i / 2;
-	sp = krb5_storage_from_mem(value_buf, sizeof(value_buf));
-	krb5_store_keyblock(sp, keyblock);
-	krb5_store_int32(sp, atoi(e.kvno));
-	krb5_store_int32(sp, atoi(e.max_life));
-	krb5_store_int32(sp, atoi(e.max_renew));
-	value.data = value_buf;
-	value.size = sp->seek(sp, 0, SEEK_CUR);
-	db->put(db, &key, &value, 0);
-	krb5_storage_free(sp);
+	ent.keyblock.contents.length = i / 2;
+	ent.kvno = atoi(e.kvno);
+	ent.max_life = atoi(e.max_life);
+	ent.max_renew = atoi(e.max_renew);
+	db->store(context, db, &ent);
     }
-    db->close(db);
+    db->close(context, db);
 }
diff --git a/kadmin/load.c b/kadmin/load.c
index d64e711d0..a4cfa2e30 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -2,30 +2,36 @@
 
 RCSID("$Id$");
 
+struct entry{
+    char *principal;
+    char *key;
+    char *kvno;
+    char *max_life;
+    char *max_renew;
+};
+
 int main(int argc, char **argv)
 {
     FILE *f;
-    DB *db;
+    HDB *db;
     krb5_context context;
     char s[1024];
     char *p;
     int line;
-    unsigned char key_buf[1024];
-    unsigned char *q;
-    unsigned char value_buf[1024];
-    krb5_keyblock keyblock;
-    DBT key, value;
     int err;
     int i;
-    krb5_storage *sp;
 
     struct entry e;
+    hdb_entry ent;
 
-    krb5_principal princ;
     
     krb5_init_context(&context);
     f = fopen(argv[1], "r");
-    db = dbopen(argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600, DB_BTREE, NULL);
+    err = hdb_open(context, &db, argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600);
+    if(err){
+	fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err));
+	exit(1);
+    }
     line = 0;
     while(fgets(s, sizeof(s), f)){
 	line++;
@@ -61,7 +67,7 @@ int main(int argc, char **argv)
 	    *p++;
 	*p++ = 0;
 
-	err = krb5_parse_name(context, e.principal, &princ);
+	err = krb5_parse_name(context, e.principal, &ent.principal);
 	if(err){
 	    fprintf(stderr, "%s:%s:%s (%s)\n", 
 		    argv[1], 
@@ -71,29 +77,17 @@ int main(int argc, char **argv)
 	    continue;
 	}
 	
-	sp = krb5_storage_from_mem(key_buf, sizeof(key_buf));
-	princ->type = 0;
-	krb5_store_principal(sp, princ);
-	key.data = key_buf;
-	key.size = sp->seek(sp, 0, SEEK_CUR);
-	krb5_storage_free(sp);
-
-	keyblock.keytype = KEYTYPE_DES;
-	keyblock.contents.data = malloc(strlen(e.key)/2+1);
+	ent.keyblock.keytype = KEYTYPE_DES;
+	ent.keyblock.contents.data = malloc(strlen(e.key)/2+1);
 	for(i = 0; i < strlen(e.key); i += 2){
 	    sscanf(e.key + i, "%2x", 
-		   (unsigned char *)keyblock.contents.data + (i/2));
+		   (unsigned char *)ent.keyblock.contents.data + (i/2));
 	}
-	keyblock.contents.length = i / 2;
-	sp = krb5_storage_from_mem(value_buf, sizeof(value_buf));
-	krb5_store_keyblock(sp, keyblock);
-	krb5_store_int32(sp, atoi(e.kvno));
-	krb5_store_int32(sp, atoi(e.max_life));
-	krb5_store_int32(sp, atoi(e.max_renew));
-	value.data = value_buf;
-	value.size = sp->seek(sp, 0, SEEK_CUR);
-	db->put(db, &key, &value, 0);
-	krb5_storage_free(sp);
+	ent.keyblock.contents.length = i / 2;
+	ent.kvno = atoi(e.kvno);
+	ent.max_life = atoi(e.max_life);
+	ent.max_renew = atoi(e.max_renew);
+	db->store(context, db, &ent);
     }
-    db->close(db);
+    db->close(context, db);
 }
diff --git a/kdc/kdc.c b/kdc/kdc.c
index 273c48b0f..9ab3cce7f 100644
--- a/kdc/kdc.c
+++ b/kdc/kdc.c
@@ -5,44 +5,17 @@ RCSID("$Id$");
 struct timeval now;
 #define kdc_time now.tv_sec
 
-struct db_entry*
+hdb_entry*
 db_fetch(krb5_context context, PrincipalName *principal, char *realm)
 {
-    DB *db;
-    DBT key, value;
-    krb5_data data;
-    krb5_storage *sp;
-    struct db_entry *ent;
-    int32_t tmp;
-    int i;
+    HDB *db;
+    hdb_entry *ent;
 
-    ent = malloc(sizeof(struct db_entry));
+    ent = malloc(sizeof(*ent));
     principalname2krb5_principal(&ent->principal, *principal, realm);
-
-    sp = krb5_storage_emem();
-    ent->principal->type = 0;
-    krb5_store_principal(sp, ent->principal);
-    krb5_storage_to_data(sp, &data);
-    krb5_storage_free(sp);
-    key.data = data.data;
-    key.size = data.length;
-    
-    db = dbopen("foo.db", O_RDONLY, 0, DB_BTREE, NULL);
-    if(db->get(db, &key, &value, 0)){
-	db->close(db);
-	return NULL;
-    }
-    krb5_data_free(&data);
-    sp = krb5_storage_from_mem(value.data, value.size);
-    krb5_ret_keyblock(sp, &ent->keyblock);
-    krb5_ret_int32(sp, &tmp);
-    ent->kvno = tmp;
-    krb5_ret_int32(sp, &tmp);
-    ent->max_life = tmp;
-    krb5_ret_int32(sp, &tmp);
-    ent->max_renew = tmp;
-    krb5_storage_free(sp);
-    db->close(db);
+    hdb_open(context, &db, NULL, O_RDONLY, 0);
+    db->fetch(context, db, ent);
+    db->close(context, db);
     return ent;
 }
 
@@ -93,7 +66,7 @@ as_rep(krb5_context context,
 {
     KDCOptions f = req->req_body.kdc_options;
     KDC_REQ_BODY *b = &req->req_body;
-    struct db_entry *client, *server;
+    hdb_entry *client, *server;
     int use_etype;
     EncTicketPart *et = calloc(1, sizeof(*et));
     EncKDCRepPart *ek = calloc(1, sizeof(*ek));
@@ -235,7 +208,7 @@ tgs_rep(krb5_context context,
     KDC_REQ_BODY *b = &req->req_body;
     KDCOptions f = req->req_body.kdc_options;
     EncTicketPart *tgt;
-    struct db_entry *server, *krbtgt, *client;
+    hdb_entry *server, *krbtgt, *client;
     EncTicketPart *et = calloc(1, sizeof(*et));
     EncKDCRepPart *ek = calloc(1, sizeof(*ek));
     
@@ -250,7 +223,7 @@ tgs_rep(krb5_context context,
 	krb5_flags ap_req_options;
 	krb5_ticket *ticket;
 	krb5_error_code err;
-	struct db_entry *ent;
+	hdb_entry *ent;
 
 	err = krb5_build_principal(context,
 				   &princ,
@@ -479,14 +452,12 @@ process_request(krb5_context context,
     krb5_principal princ;
     unsigned char key_buf[1024];
     unsigned char *q;
-    DB *db;
-    DBT key, value;
 
     
     KDC_REP rep;
 
 
-    struct db_entry *cname, *sname;
+    hdb_entry *cname, *sname;
     
     gettimeofday(&now, NULL);
 
diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 273c48b0f..9ab3cce7f 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -5,44 +5,17 @@ RCSID("$Id$");
 struct timeval now;
 #define kdc_time now.tv_sec
 
-struct db_entry*
+hdb_entry*
 db_fetch(krb5_context context, PrincipalName *principal, char *realm)
 {
-    DB *db;
-    DBT key, value;
-    krb5_data data;
-    krb5_storage *sp;
-    struct db_entry *ent;
-    int32_t tmp;
-    int i;
+    HDB *db;
+    hdb_entry *ent;
 
-    ent = malloc(sizeof(struct db_entry));
+    ent = malloc(sizeof(*ent));
     principalname2krb5_principal(&ent->principal, *principal, realm);
-
-    sp = krb5_storage_emem();
-    ent->principal->type = 0;
-    krb5_store_principal(sp, ent->principal);
-    krb5_storage_to_data(sp, &data);
-    krb5_storage_free(sp);
-    key.data = data.data;
-    key.size = data.length;
-    
-    db = dbopen("foo.db", O_RDONLY, 0, DB_BTREE, NULL);
-    if(db->get(db, &key, &value, 0)){
-	db->close(db);
-	return NULL;
-    }
-    krb5_data_free(&data);
-    sp = krb5_storage_from_mem(value.data, value.size);
-    krb5_ret_keyblock(sp, &ent->keyblock);
-    krb5_ret_int32(sp, &tmp);
-    ent->kvno = tmp;
-    krb5_ret_int32(sp, &tmp);
-    ent->max_life = tmp;
-    krb5_ret_int32(sp, &tmp);
-    ent->max_renew = tmp;
-    krb5_storage_free(sp);
-    db->close(db);
+    hdb_open(context, &db, NULL, O_RDONLY, 0);
+    db->fetch(context, db, ent);
+    db->close(context, db);
     return ent;
 }
 
@@ -93,7 +66,7 @@ as_rep(krb5_context context,
 {
     KDCOptions f = req->req_body.kdc_options;
     KDC_REQ_BODY *b = &req->req_body;
-    struct db_entry *client, *server;
+    hdb_entry *client, *server;
     int use_etype;
     EncTicketPart *et = calloc(1, sizeof(*et));
     EncKDCRepPart *ek = calloc(1, sizeof(*ek));
@@ -235,7 +208,7 @@ tgs_rep(krb5_context context,
     KDC_REQ_BODY *b = &req->req_body;
     KDCOptions f = req->req_body.kdc_options;
     EncTicketPart *tgt;
-    struct db_entry *server, *krbtgt, *client;
+    hdb_entry *server, *krbtgt, *client;
     EncTicketPart *et = calloc(1, sizeof(*et));
     EncKDCRepPart *ek = calloc(1, sizeof(*ek));
     
@@ -250,7 +223,7 @@ tgs_rep(krb5_context context,
 	krb5_flags ap_req_options;
 	krb5_ticket *ticket;
 	krb5_error_code err;
-	struct db_entry *ent;
+	hdb_entry *ent;
 
 	err = krb5_build_principal(context,
 				   &princ,
@@ -479,14 +452,12 @@ process_request(krb5_context context,
     krb5_principal princ;
     unsigned char key_buf[1024];
     unsigned char *q;
-    DB *db;
-    DBT key, value;
 
     
     KDC_REP rep;
 
 
-    struct db_entry *cname, *sname;
+    hdb_entry *cname, *sname;
     
     gettimeofday(&now, NULL);
 
diff --git a/kdc/load.c b/kdc/load.c
index d64e711d0..a4cfa2e30 100644
--- a/kdc/load.c
+++ b/kdc/load.c
@@ -2,30 +2,36 @@
 
 RCSID("$Id$");
 
+struct entry{
+    char *principal;
+    char *key;
+    char *kvno;
+    char *max_life;
+    char *max_renew;
+};
+
 int main(int argc, char **argv)
 {
     FILE *f;
-    DB *db;
+    HDB *db;
     krb5_context context;
     char s[1024];
     char *p;
     int line;
-    unsigned char key_buf[1024];
-    unsigned char *q;
-    unsigned char value_buf[1024];
-    krb5_keyblock keyblock;
-    DBT key, value;
     int err;
     int i;
-    krb5_storage *sp;
 
     struct entry e;
+    hdb_entry ent;
 
-    krb5_principal princ;
     
     krb5_init_context(&context);
     f = fopen(argv[1], "r");
-    db = dbopen(argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600, DB_BTREE, NULL);
+    err = hdb_open(context, &db, argv[2], O_RDWR | O_CREAT | O_TRUNC, 0600);
+    if(err){
+	fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err));
+	exit(1);
+    }
     line = 0;
     while(fgets(s, sizeof(s), f)){
 	line++;
@@ -61,7 +67,7 @@ int main(int argc, char **argv)
 	    *p++;
 	*p++ = 0;
 
-	err = krb5_parse_name(context, e.principal, &princ);
+	err = krb5_parse_name(context, e.principal, &ent.principal);
 	if(err){
 	    fprintf(stderr, "%s:%s:%s (%s)\n", 
 		    argv[1], 
@@ -71,29 +77,17 @@ int main(int argc, char **argv)
 	    continue;
 	}
 	
-	sp = krb5_storage_from_mem(key_buf, sizeof(key_buf));
-	princ->type = 0;
-	krb5_store_principal(sp, princ);
-	key.data = key_buf;
-	key.size = sp->seek(sp, 0, SEEK_CUR);
-	krb5_storage_free(sp);
-
-	keyblock.keytype = KEYTYPE_DES;
-	keyblock.contents.data = malloc(strlen(e.key)/2+1);
+	ent.keyblock.keytype = KEYTYPE_DES;
+	ent.keyblock.contents.data = malloc(strlen(e.key)/2+1);
 	for(i = 0; i < strlen(e.key); i += 2){
 	    sscanf(e.key + i, "%2x", 
-		   (unsigned char *)keyblock.contents.data + (i/2));
+		   (unsigned char *)ent.keyblock.contents.data + (i/2));
 	}
-	keyblock.contents.length = i / 2;
-	sp = krb5_storage_from_mem(value_buf, sizeof(value_buf));
-	krb5_store_keyblock(sp, keyblock);
-	krb5_store_int32(sp, atoi(e.kvno));
-	krb5_store_int32(sp, atoi(e.max_life));
-	krb5_store_int32(sp, atoi(e.max_renew));
-	value.data = value_buf;
-	value.size = sp->seek(sp, 0, SEEK_CUR);
-	db->put(db, &key, &value, 0);
-	krb5_storage_free(sp);
+	ent.keyblock.contents.length = i / 2;
+	ent.kvno = atoi(e.kvno);
+	ent.max_life = atoi(e.max_life);
+	ent.max_renew = atoi(e.max_renew);
+	db->store(context, db, &ent);
     }
-    db->close(db);
+    db->close(context, db);
 }