diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 280ff59a6..fd6674cce 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -9,7 +9,7 @@ libasn1_la_LDFLAGS = -version-info 7:0:0
 
 libasn1_la_LIBADD = \
 	@LIB_com_err@ \
-	$(top_builddir)/lib/roken/libroken.la
+	$(LIBADD_roken)
 
 BUILT_SOURCES =				\
 	$(gen_files_rfc2459:.x=.c)	\
diff --git a/lib/des/Makefile.am b/lib/des/Makefile.am
index 283a01c00..fc0a6154c 100644
--- a/lib/des/Makefile.am
+++ b/lib/des/Makefile.am
@@ -7,7 +7,7 @@ libhcrypto_la_LDFLAGS = -version-info 4:0:0
 libhcrypto_la_LIBADD = \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_dlopen) \
-	$(top_builddir)/lib/roken/libroken.la
+	$(LIBADD_roken)
 
 hcryptoincludedir = $(includedir)/hcrypto
 buildhcryptoinclude = $(buildinclude)/hcrypto
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 1f49ee4de..bfb135e63 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -195,7 +195,7 @@ libgssapi_la_LIBADD = \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_com_err) \
 	$(LIB_des) \
-	$(top_builddir)/lib/roken/libroken.la
+	$(LIBADD_roken)
 
 man_MANS = gssapi.3 gss_acquire_cred.3
 
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index c51e5047a..87acc2f30 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -77,7 +77,7 @@ libhdb_la_LIBADD = \
 	$(LIB_com_err) \
 	../krb5/libkrb5.la \
 	../asn1/libasn1.la \
-	../roken/libroken.la \
+	$(LIBADD_roken) \
 	$(LIB_openldap) \
 	$(LIB_dlopen) \
 	$(DBLIB) \
diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index c01d18755..200b1d601 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -82,7 +82,7 @@ libhx509_la_LIBADD = \
 	$(LIB_com_err) \
 	$(LIB_des) \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(top_builddir)/lib/roken/libroken.la \
+	$(LIBADD_roken) \
 	$(LIB_dlopen)
 
 libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des)
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index 8e99c1d0b..38f75e7e1 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -13,9 +13,9 @@ noinst_PROGRAMS = test_pw_quality
 
 libkadm5srv_la_LIBADD = \
 	$(LIB_com_err) ../krb5/libkrb5.la \
-	../hdb/libhdb.la ../roken/libroken.la
+	../hdb/libhdb.la $(LIBADD_roken)
 libkadm5clnt_la_LIBADD = \
-	$(LIB_com_err) ../krb5/libkrb5.la ../roken/libroken.la
+	$(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken)
 
 libexec_PROGRAMS = ipropd-master ipropd-slave
 
diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
index 844179d0a..4485a65ec 100644
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -51,7 +51,7 @@ AFSL_EXP =
 AIX_SRC =
 endif # AIX
 
-libkafs_la_LIBADD = $(DEPLIB_krb5) ../roken/libroken.la $(DEPLIB_krb4)
+libkafs_la_LIBADD = $(DEPLIB_krb5) $(LIBADD_roken) $(DEPLIB_krb4)
 
 lib_LTLIBRARIES = libkafs.la
 libkafs_la_LDFLAGS = -version-info 5:0:5
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 1647fdd71..86db7d050 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -51,7 +51,7 @@ libkrb5_la_LIBADD = \
 	$(LIB_com_err) \
 	$(LIB_des) \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(top_builddir)/lib/roken/libroken.la \
+	$(LIBADD_roken) \
 	$(LIB_door_create) \
 	$(LIB_dlopen)
 
diff --git a/lib/ntlm/Makefile.am b/lib/ntlm/Makefile.am
index ae8ad17fd..b8c25d0da 100644
--- a/lib/ntlm/Makefile.am
+++ b/lib/ntlm/Makefile.am
@@ -12,7 +12,7 @@ libheimntlm_la_LDFLAGS = -version-info 0:0:0
 
 libheimntlm_la_LIBADD = \
 	../krb5/libkrb5.la \
-	$(top_builddir)/lib/roken/libroken.la
+	$(LIBADD_roken)
 
 $(srcdir)/heimntlm-protos.h:
 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -o heimntlm-protos.h $(libheimntlm_la_SOURCES) || rm -f heimntlm-protos.h