diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index ac7641311..9d1d91bed 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -59,19 +59,19 @@ libkadm5clnt_a_SOURCES = $(COMMON_SOURCES) client_glue.c
 
 dump_log_SOURCES = dump_log.c
 
-dump_log_LDADD = libkadm5srv.a -L$(top_builddir)/lib/hdb -lhdb -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/roken -lroken
-
 replay_log_SOURCES = replay_log.c
 
-replay_log_LDADD = libkadm5srv.a -L$(top_builddir)/lib/hdb -lhdb -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/roken -lroken
-
 ipropd_master_SOURCES = ipropd_master.c
 
-ipropd_master_LDADD = libkadm5srv.a -L$(top_builddir)/lib/hdb -lhdb -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/roken -lroken
-
 ipropd_slave_SOURCES = ipropd_slave.c
 
-ipropd_slave_LDADD = libkadm5srv.a -L$(top_builddir)/lib/hdb -lhdb -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/roken -lroken
+LDADD = \
+	-L. -lkadm5srv \
+	-L$(top_builddir)/lib/hdb -lhdb \
+	-L$(top_builddir)/lib/krb5 -lkrb5 \
+	-L$(top_builddir)/lib/asn1 -lasn1 \
+	-L$(top_builddir)/lib/des -ldes \
+	-L$(top_builddir)/lib/roken -lroken
 
 CLEANFILES = kadm5_err.c kadm5_err.h