diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 7fb5ec268..fa3aadc6a 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -6,6 +6,11 @@ INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline)
 
 sbin_PROGRAMS = kadmin
 
-kadmin_SOURCES = kadmin.c ank.c cpw.c del.c ext.c get.c
+libexec_PROGRAMS = kadmind
 
-LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.a $(top_builddir)/lib/hdb/libhdb.a $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/sl/libsl.a $(LIB_readline) $(top_builddir)/lib/roken/libroken.a
+kadmin_SOURCES = kadmin.c ank.c cpw.c del.c ext.c get.c rename.c
+
+COMMON_LDADD = $(top_builddir)/lib/hdb/libhdb.a $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/sl/libsl.a $(LIB_readline) $(top_builddir)/lib/roken/libroken.a
+
+kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.a $(COMMON_LDADD)
+kadmin_LDADD = $(top_builddir)/lib/kadm5/libkadm5clnt.a $(COMMON_LDADD)