diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
new file mode 100644
index 000000000..855826026
--- /dev/null
+++ b/kadmin/kadmind.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden). 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ *
+ * 3. All advertising materials mentioning features or use of this software 
+ *    must display the following acknowledgement: 
+ *      This product includes software developed by Kungliga Tekniska 
+ *      Högskolan and its contributors. 
+ *
+ * 4. Neither the name of the Institute nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ */
+
+#include "kadmin_locl.h"
+
+RCSID("$Id$");
+
+static char *config_file;
+static char *keyfile;
+static int help_flag;
+static int version_flag;
+static int debug_flag;
+static int debug_port;
+static char *realm;
+
+static struct getargs args[] = {
+    { 
+	"config-file",	'c',	arg_string,	&config_file, 
+	"location of config file",	"file" 
+    },
+    {
+	"key-file",	'k',	arg_string, &keyfile, 
+	"location of master key file", "file"
+    },
+    {	"realm",	'r',	arg_string,   &realm, 
+	"realm to use", "realm" 
+    },
+    {	"debug",	'd',	arg_flag,   &debug_flag, 
+	"enable debugging" 
+    },
+    {	"debug",	'd',	arg_flag,   &debug_flag, 
+	"port to use with debug", "port" 
+    },
+    {	"debug-port",	'p',	arg_integer,&debug_port },
+    {	"help",		'h',	arg_flag,   &help_flag },
+    {	"version",	'v',	arg_flag,   &version_flag }
+};
+
+static int num_args = sizeof(args) / sizeof(args[0]);
+
+krb5_context context;
+void *kadm_handle;
+
+static void
+usage(int ret)
+{
+    arg_printusage (args, num_args, "");
+    exit (ret);
+}
+
+kadm5_ret_t
+kadm5_server_send(krb5_context context, krb5_auth_context ac, 
+		  krb5_storage *sp, int fd)
+{
+    unsigned char buf[1024];
+    size_t len;
+    krb5_data in, out;
+    kadm5_ret_t ret;
+    len = sp->seek(sp, 0, SEEK_CUR);
+    sp->seek(sp, 0, SEEK_SET);
+    if(len > sizeof(buf))
+	return ENOMEM;
+    sp->fetch(sp, buf, len);
+    in.data = buf;
+    in.length = len;
+    ret = krb5_mk_priv(context, ac, &in, &out, NULL);
+    if(ret)
+	return ret;
+    buf[0] = (out.length >> 24) & 0xff;
+    buf[1] = (out.length >> 16) & 0xff;
+    buf[2] = (out.length >> 8) & 0xff;
+    buf[3] = out.length & 0xff;
+    krb5_net_write(context, fd, buf, 4);
+    krb5_net_write(context, fd, out.data, out.length);
+    krb5_data_free(&out);
+    return 0;
+}
+
+kadm5_ret_t
+kadm5_server_recv(krb5_context context, krb5_auth_context ac, 
+		  krb5_storage *sp, int fd)
+{
+    unsigned char buf[1024];
+    size_t len;
+    krb5_data in, out;
+    kadm5_ret_t ret;
+
+    if(krb5_net_read(context, fd, buf, 4) != 4)
+	krb5_err(context, 1, errno, "krb5_net_read");
+    len = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
+    if(len > sizeof(buf))
+	return ENOMEM;
+    if(krb5_net_read(context, fd, buf, len) != len)
+	krb5_err(context, 1, errno, "krb5_net_read");
+    in.data = buf;
+    in.length = len;
+    ret = krb5_rd_priv(context, ac, &in, &out, NULL);
+    if(ret)
+	return ret;
+    sp->store(sp, out.data, out.length);
+    sp->seek(sp, 0, SEEK_SET);
+    krb5_data_free(&out);
+    return 0;
+}
+
+int
+main(int argc, char **argv)
+{
+    krb5_error_code ret;
+    krb5_config_section *cf;
+    int optind = 0;
+    int e;
+    krb5_log_facility *logf;
+
+    set_progname(argv[0]);
+
+    krb5_init_context(&context);
+
+    ret = krb5_openlog(context, "kadmind", &logf);
+    ret = krb5_set_warn_dest(context, logf);
+
+    while((e = getarg(args, num_args, argc, argv, &optind)))
+	warnx("error at argument `%s'", argv[optind]);
+
+    if (help_flag)
+	usage (0);
+
+    if (version_flag)
+	krb5_errx(context, 0, "%s", heimdal_version);
+
+    argc -= optind;
+    argv += optind;
+
+    if (config_file == NULL)
+	config_file = HDB_DB_DIR "/kdc.conf";
+
+    if(krb5_config_parse_file(config_file, &cf) == 0) {
+	const char *p = krb5_config_get_string (cf, "kdc", "key-file", NULL);
+	if (p)
+	    keyfile = strdup(p);
+    }
+
+    {
+	krb5_principal server;
+	int fd = 0;
+	krb5_auth_context ac = NULL;
+	krb5_ticket *ticket;
+	char *client;
+	if(debug_flag){
+	    if(debug_port == 0)
+		debug_port = krb5_getportbyname (context, "kerberos-adm", 
+						 "tcp", 749);
+	    mini_inetd(htons(debug_port));
+	}
+	if(realm)
+	    krb5_set_default_realm(context, realm); /* XXX */
+	krb5_parse_name(context, KADM5_ADMIN_SERVICE, &server);
+	ret = krb5_recvauth(context, &ac, &fd, KADMIN_APPL_VERSION, 
+			    server, 0, NULL, &ticket);
+	
+	if(ret)
+	    krb5_err(context, 1, ret, "krb5_recvauth");
+	krb5_unparse_name(context, ticket->client, &client);
+	
+	ret = kadm5_init_with_password_ctx(context, 
+					   client, 
+					   "password", 
+					   "service",
+					   NULL, 0, 0, 
+					   &kadm_handle);
+	
+	while(1){
+	    unsigned char buf[1024];
+	    krb5_storage *sp;
+
+	    sp = krb5_storage_from_mem(buf, sizeof(buf));
+	    ret = kadm5_server_recv(context, ac, sp, fd);
+	    if(ret)
+		krb5_err(context, 1, ret, "kadm5_server_recv");
+	    kadmind_dispatch(kadm_handle, sp);
+	    ret = kadm5_server_send(context, ac, sp, fd);
+	    krb5_storage_free(sp);
+	}
+    }
+}