diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index ac00cb25c..1a9e24da3 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -23,7 +23,8 @@ hprop_LDADD = ../lib/hdb/libhdb.a \
 	../lib/des/libdes.a \
 	../lib/asn1/libasn1.a \
 	$(LIB_krb4) -lkdb $(LIB_krb4) \
-	../lib/roken/libroken.a 
+	../lib/roken/libroken.a \
+	$(DBLIB) 
 else
 hprop_LDADD = $(LDADD)
 endif
@@ -33,5 +34,6 @@ LDADD = ../lib/hdb/libhdb.a \
 	../lib/des/libdes.a \
 	../lib/asn1/libasn1.a \
 	$(LIB_krb4) \
-	../lib/roken/libroken.a 
+	../lib/roken/libroken.a \
+	$(DBLIB)
 
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 8b8179266..2a20284a8 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -10,6 +10,13 @@ bin_PROGRAMS = kpasswd
 
 libexec_PROGRAMS = kpasswdd
 
-kpasswdd_LDADD = -L$(top_builddir)/lib/kadm5 -lkadm5srv -L$(top_builddir)/lib/hdb -lhdb $(LDADD)
+kpasswdd_LDADD = \
+	$(top_builddir)/lib/kadm5/libkadm5srv.a \
+	$(top_builddir)/lib/hdb/libhdb.a \
+	$(LDADD) \
+	$(DBLIB)
 
-LDADD = -L$(top_builddir)/lib/krb5  -lkrb5 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken
+LDADD = $(top_builddir)/lib/krb5/libkrb5.a \
+	$(top_builddir)/lib/des/libdes.a \
+	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/roken/libroken.a
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index 9d1d91bed..cbd2ed2de 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -66,12 +66,13 @@ ipropd_master_SOURCES = ipropd_master.c
 ipropd_slave_SOURCES = ipropd_slave.c
 
 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
+	libkadm5srv.a \
+	$(top_builddir)/lib/hdb/libhdb.a \
+	$(top_builddir)/lib/krb5/libkrb5.a \
+	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/des/libdes.a \
+	$(top_builddir)/lib/roken/libroken.a \
+	$(DBLIB)
 
 CLEANFILES = kadm5_err.c kadm5_err.h