diff --git a/admin/admin_locl.h b/admin/admin_locl.h
index d57e7158f..d578b0e04 100644
--- a/admin/admin_locl.h
+++ b/admin/admin_locl.h
@@ -75,7 +75,7 @@
 extern krb5_context context;
 extern char *database;
 
-#define DECL(X) void X(int, char **)
+#define DECL(X) int X(int, char **)
 
 DECL(get_entry);
 DECL(load);
diff --git a/admin/ank.c b/admin/ank.c
index 45a3baf5b..9ed38cd25 100644
--- a/admin/ank.c
+++ b/admin/ank.c
@@ -150,7 +150,7 @@ out:
 }
 
 
-void
+int
 add_new_key(int argc, char **argv)
 {
     if(argc != 2){
@@ -159,9 +159,10 @@ add_new_key(int argc, char **argv)
     }
 
     doit(argv[1], 0);
+    return 0;
 }
 
-void
+int
 mod_entry(int argc, char **argv)
 {
     if(argc != 2){
@@ -170,4 +171,5 @@ mod_entry(int argc, char **argv)
     }
 
     doit(argv[1], 1);
+    return 0;
 }
diff --git a/admin/delete.c b/admin/delete.c
index 43fb84221..07335bb0a 100644
--- a/admin/delete.c
+++ b/admin/delete.c
@@ -40,7 +40,7 @@
 
 RCSID("$Id$");
 
-void
+int
 del_entry(int argc, char **argv)
 {
     HDB *db;
@@ -49,14 +49,14 @@ del_entry(int argc, char **argv)
     
     if(argc != 2){
 	warnx("Usage: del_entry principal");
-	return;
+	return 0;
     }
 	
     krb5_parse_name(context, argv[1], &ent.principal);
     
     if((err = hdb_open(context, &db, database, O_RDWR, 0600))){
 	warnx("hdb_open: %s", krb5_get_err_text(context, err));
-	return;
+	return 0;
     }
     
     err = db->delete(context, db, &ent);
@@ -71,4 +71,5 @@ del_entry(int argc, char **argv)
     krb5_free_principal (context, ent.principal);
     memset(&ent, 0, sizeof(ent));
     db->close(context, db);
+    return 0;
 }
diff --git a/admin/dump.c b/admin/dump.c
index 7c1f06840..0539ec180 100644
--- a/admin/dump.c
+++ b/admin/dump.c
@@ -66,7 +66,7 @@ key2str(krb5_keyblock *key)
     return s;
 }
 
-void
+int
 dump(int argc, char **argv)
 {
     HDB *db;
@@ -86,7 +86,7 @@ dump(int argc, char **argv)
 	warnx("hdb_open: %s", krb5_get_err_text(context, err));
 	if(f != stdout)
 	    fclose(f);
-	return;
+	return 0;
     }
     err = db->firstkey(context, db, &ent);
     while(err == 0){
@@ -111,4 +111,5 @@ dump(int argc, char **argv)
     if(f != stdout)
 	fclose(f);
     db->close(context, db);
+    return 0;
 }
diff --git a/admin/extkeytab.c b/admin/extkeytab.c
index 7d342b63a..8439668ec 100644
--- a/admin/extkeytab.c
+++ b/admin/extkeytab.c
@@ -40,7 +40,7 @@
 
 RCSID("$Id$");
 
-void 
+int 
 ext_keytab(int argc, char **argv)
 {
     HDB *db;
@@ -53,14 +53,14 @@ ext_keytab(int argc, char **argv)
     
     if(argc != 2){
 	warnx("Usage: ext_keytab principal\n");
-	return;
+	return 0;
     }
 	
     
     ret = hdb_open(context, &db, database, O_RDONLY, 0600);
     if(ret){
 	warnx("%s", krb5_get_err_text(context, ret));
-	return;
+	return 0;
     }
 
     ret = krb5_parse_name (context, argv[1], &ent.principal);
@@ -105,4 +105,5 @@ cleanup2:
     hdb_free_entry (context, &ent);
 cleanup1:
     db->close (context, db);
+    return 0;
 }
diff --git a/admin/get.c b/admin/get.c
index a2d809459..e5c61a543 100644
--- a/admin/get.c
+++ b/admin/get.c
@@ -40,7 +40,7 @@
 
 RCSID("$Id$");
 
-void
+int
 get_entry(int argc, char **argv)
 {
     HDB *db;
@@ -49,14 +49,14 @@ get_entry(int argc, char **argv)
     
     if(argc != 2){
 	fprintf(stderr, "Usage: get_entry principal\n");
-	return;
+	return 0;
     }
 	
     krb5_parse_name(context, argv[1], &ent.principal);
     
     if((err = hdb_open(context, &db, database, O_RDONLY, 0600))){
 	fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err));
-	return;
+	return 0;
     }
     
     err = db->fetch(context, db, &ent);
@@ -86,4 +86,5 @@ get_entry(int argc, char **argv)
     }
     memset(&ent, 0, sizeof(ent));
     db->close(context, db);
+    return 0;
 }
diff --git a/admin/init.c b/admin/init.c
index 495a1e422..52bd9ac07 100644
--- a/admin/init.c
+++ b/admin/init.c
@@ -65,7 +65,7 @@ get_time(const char *prompt, time_t def)
 }
 
 
-void
+int
 init(int argc, char **argv)
 {
     HDB *db;
@@ -86,7 +86,7 @@ init(int argc, char **argv)
     err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600);
     if(err){
 	warnx("hdb_open: %s", krb5_get_err_text(context, err));
-	return;
+	return 0;
     }
     memset(&ent, 0, sizeof(ent));
     for(i = 1; i < argc; i++){
@@ -106,7 +106,7 @@ init(int argc, char **argv)
 	default:
 	    warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
 	    db->close(context, db);
-	    return;
+	    return 0;
 	}
 	
 	max_life = get_time("Realm max ticket life", max_life);
@@ -159,4 +159,5 @@ init(int argc, char **argv)
 	hdb_free_entry(context, &ent);
     }
     db->close(context, db);
+    return 0;
 }
diff --git a/admin/kdb_edit.c b/admin/kdb_edit.c
index 2fad32d97..8ab1ed963 100644
--- a/admin/kdb_edit.c
+++ b/admin/kdb_edit.c
@@ -59,16 +59,17 @@ static SL_cmd commands[] = {
 krb5_context context;
 char *database = HDB_DEFAULT_DB;
 
-void
+int
 help(int argc, char **argv)
 {
     sl_help(commands, argc, argv);
+    return 0;
 }
 
-void
+int
 exit_kdb_edit (int argc, char **argv)
 {
-    exit (0);
+    return 1;
 }
 
 int
diff --git a/admin/load.c b/admin/load.c
index a745d9f69..f6bb5bdd1 100644
--- a/admin/load.c
+++ b/admin/load.c
@@ -144,7 +144,7 @@ doit(char *filename, int merge)
     fclose(f);
 }
 
-void
+int
 load(int argc, char **argv)
 {
     if(argc < 2){
@@ -152,9 +152,10 @@ load(int argc, char **argv)
 	return;
     }
     doit(argv[1], 0);
+    return 0;
 }
 
-void
+int
 merge(int argc, char **argv)
 {
     if(argc < 2){
@@ -162,4 +163,5 @@ merge(int argc, char **argv)
 	return;
     }
     doit(argv[1], 1);
+    return 0;
 }
diff --git a/kadmin/dump.c b/kadmin/dump.c
index 7c1f06840..0539ec180 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -66,7 +66,7 @@ key2str(krb5_keyblock *key)
     return s;
 }
 
-void
+int
 dump(int argc, char **argv)
 {
     HDB *db;
@@ -86,7 +86,7 @@ dump(int argc, char **argv)
 	warnx("hdb_open: %s", krb5_get_err_text(context, err));
 	if(f != stdout)
 	    fclose(f);
-	return;
+	return 0;
     }
     err = db->firstkey(context, db, &ent);
     while(err == 0){
@@ -111,4 +111,5 @@ dump(int argc, char **argv)
     if(f != stdout)
 	fclose(f);
     db->close(context, db);
+    return 0;
 }
diff --git a/kadmin/init.c b/kadmin/init.c
index 495a1e422..52bd9ac07 100644
--- a/kadmin/init.c
+++ b/kadmin/init.c
@@ -65,7 +65,7 @@ get_time(const char *prompt, time_t def)
 }
 
 
-void
+int
 init(int argc, char **argv)
 {
     HDB *db;
@@ -86,7 +86,7 @@ init(int argc, char **argv)
     err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600);
     if(err){
 	warnx("hdb_open: %s", krb5_get_err_text(context, err));
-	return;
+	return 0;
     }
     memset(&ent, 0, sizeof(ent));
     for(i = 1; i < argc; i++){
@@ -106,7 +106,7 @@ init(int argc, char **argv)
 	default:
 	    warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
 	    db->close(context, db);
-	    return;
+	    return 0;
 	}
 	
 	max_life = get_time("Realm max ticket life", max_life);
@@ -159,4 +159,5 @@ init(int argc, char **argv)
 	hdb_free_entry(context, &ent);
     }
     db->close(context, db);
+    return 0;
 }
diff --git a/kadmin/load.c b/kadmin/load.c
index a745d9f69..f6bb5bdd1 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -144,7 +144,7 @@ doit(char *filename, int merge)
     fclose(f);
 }
 
-void
+int
 load(int argc, char **argv)
 {
     if(argc < 2){
@@ -152,9 +152,10 @@ load(int argc, char **argv)
 	return;
     }
     doit(argv[1], 0);
+    return 0;
 }
 
-void
+int
 merge(int argc, char **argv)
 {
     if(argc < 2){
@@ -162,4 +163,5 @@ merge(int argc, char **argv)
 	return;
     }
     doit(argv[1], 1);
+    return 0;
 }