diff --git a/admin/Makefile.am b/admin/Makefile.am
index 1f1609fd8..871f9147e 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-CFLAGS=@CFLAGS@ $(WFLAGS)
+CFLAGS = @CFLAGS@ $(WFLAGS)
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline)
 
@@ -12,4 +12,10 @@ sbin_PROGRAMS = ktutil
 
 ktutil_SOURCES = ktutil.c srvconvert.c
 
-LDADD = $(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
\ No newline at end of file
+LDADD = \
+	$(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
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 636ae7193..1733f2014 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -12,7 +12,15 @@ kadmin_SOURCES = 						\
 	ank.c cpw.c del.c dump.c ext.c get.c init.c kadmin.c	\
 	load.c mod.c rename.c util.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
+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 \
+	$(DBLIB)
 
 kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.a $(COMMON_LDADD)
 kadmin_LDADD = $(top_builddir)/lib/kadm5/libkadm5clnt.a $(COMMON_LDADD)