diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am
new file mode 100644
index 000000000..0f2ebe6fb
--- /dev/null
+++ b/appl/afsutil/Makefile.am
@@ -0,0 +1,9 @@
+# $Id$
+
+AUTOMAKE_OPTIONS = no-dependencies foreign
+
+INCLUDES = -I$(top_builddir)/include
+
+bin_PROGRAMS = afslog
+
+LDADD = $(top_builddir)/lib/kafs/libkafs.a $(LIB_krb4) $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/roken/libroken.a
diff --git a/appl/afsutil/afslog.c b/appl/afsutil/afslog.c
new file mode 100644
index 000000000..0ce2194d3
--- /dev/null
+++ b/appl/afsutil/afslog.c
@@ -0,0 +1,168 @@
+#include <krb5.h>
+#include <kafs.h>
+#include <roken.h>
+#include <getarg.h>
+
+static int help_flag;
+static int version_flag;
+static int crete_user;
+static getarg_strings cells;
+static char *realm;
+static getarg_strings files;
+static int unlog_flag;
+static int verbose;
+
+struct getargs args[] = {
+    { "help", 'h', arg_flag, &help_flag, NULL, NULL },
+    { "version", 0, arg_flag, &version_flag, NULL, NULL },
+    { "verbose", 'v', arg_flag, &verbose, NULL, NULL },
+#if 0
+    { "create-user", 0, arg_flag, &crete_user, 
+      "create user if not found", NULL },
+#endif
+    { "cell", 'c', arg_strings, &cells, "cell to get tokens for", "cell" },
+    { "realm", 'k', arg_string, &realm, "realm for afs cell", "realm" },
+    { "file", 'p', arg_strings, &files, "file to get tokens for", "path" },
+    { "unlog", 'u', arg_flag, &unlog_flag, "remove tokens", NULL },
+};
+
+static int num_args = sizeof(args) / sizeof(args[0]);
+
+static const char *
+expand_cell_name(const char *cell)
+{
+    FILE *F;
+    static char buf[128];
+    char *p;
+
+    F = fopen(_PATH_CELLSERVDB, "r");
+    if(F == NULL)
+	return cell;
+    do{
+	fgets(buf, 128, F);
+	if(buf[0] == '>'){
+	    for(p=buf; *p && *p != ' ' && *p != '\t'; p++);
+	    *p=0;
+	    if(strstr(buf, cell)){
+		fclose(F);
+		return buf + 1;
+	    }
+	}
+	buf[0] = 0;
+    }while(!feof(F));
+    fclose(F);
+    return cell;
+}
+
+#if 0
+static int
+createuser (char *cell)
+{
+    char cellbuf[64];
+    char name[ANAME_SZ];
+    char instance[INST_SZ];
+    char realm[REALM_SZ];
+    char cmd[1024];
+
+    if (cell == NULL) {
+	FILE *f;
+	int len;
+
+	f = fopen (_PATH_THISCELL, "r");
+	if (f == NULL)
+	    err (1, "open(%s)", _PATH_THISCELL);
+	if (fgets (cellbuf, sizeof(cellbuf), f) == NULL)
+	    err (1, "read cellname from %s", _PATH_THISCELL);
+	len = strlen(cellbuf);
+	if (cellbuf[len-1] == '\n')
+	    cellbuf[len-1] = '\0';
+	cell = cellbuf;
+    }
+
+    if(krb_get_default_principal(name, instance, realm))
+	errx (1, "Could not even figure out who you are");
+
+    snprintf (cmd, sizeof(cmd),
+	      "pts createuser %s%s%s@%s -cell %s",
+	      name, *instance ? "." : "", instance, strlwr(realm),
+	      cell);
+    DEBUG("Executing %s", cmd);
+    return system(cmd);
+}
+#endif
+
+void
+usage(int ecode)
+{
+    arg_printusage(args, num_args, "");
+    exit(ecode);
+}
+
+static int
+afslog_cell(krb5_context context, krb5_ccache id,
+	    const char *cell, int expand)
+{
+    const char *c = cell;
+    if(expand){
+	c = expand_cell_name(cell);
+	if(c == NULL){
+	    krb5_warnx(context, "No cell matching \"%s\" found.", cell);
+	    return -1;
+	}
+	if(verbose)
+	    krb5_warnx(context, "Cell \"%s\" expanded to \"%s\"", cell, c);
+    }
+    return k5_afsklog(context, id, c, realm);
+}
+
+static int
+afslog_file(krb5_context context, krb5_ccache id,
+	    const char *path)
+{
+    char cell[64];
+    if(k_afs_cell_of_file(path, cell, sizeof(cell))){
+	krb5_warnx(context, "No cell found for file \"%s\".", path);
+	return -1;
+    }
+    if(verbose)
+	krb5_warnx(context, "File \"%s\" lives in cell \"%s\"", path, cell);
+    return afslog_cell(context, id, cell, 0);
+}
+
+int main(int argc, char **argv)
+{
+    int optind = 0;
+    krb5_context context;
+    krb5_ccache id;
+    char cellbuf[64];
+    int i;
+    
+    set_progname(argv[0]);
+
+    krb5_init_context(&context);
+    if(!k_hasafs())
+	krb5_errx(context, 1, "No AFS!");
+    if(getarg(args, num_args, argc, argv, &optind))
+	usage(1);
+    if(help_flag)
+	usage(0);
+    if(version_flag)
+	krb5_errx(context, 0, "%s", heimdal_version);
+    if(unlog_flag){
+	k_unlog();
+	exit(0);
+    }
+    krb5_cc_default(context, &id);
+    for(i = 0; i < files.num_strings; i++)
+	afslog_file(context, id, files.strings[i]);
+    for(i = 0; i < cells.num_strings; i++)
+	afslog_cell(context, id, cells.strings[i], 1);
+    for(i = optind; i < argc; i++){
+	if(strcmp(argv[i], ".") == 0 ||
+	   strcmp(argv[i], "..") == 0 ||
+	   strchr(argv[i], '/'))
+	    afslog_file(context, id, argv[i]);
+	else
+	    afslog_cell(context, id, argv[i], 1);
+    }    
+}