diff --git a/lib/Makefile b/lib/Makefile
index f9b18cab1611..416d411ace1e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.99 2006/02/08 18:58:55 agc Exp $
+#	$NetBSD: Makefile,v 1.100 2006/03/17 21:43:16 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -35,8 +35,7 @@ SUBDIR+= libcrypto_rc5
 
 .if (${MKKERBEROS} != "no")
 # Heimdal Kerberos 5 libraries
-SUBDIR+= libroken libvers libcom_err libsl libss libasn1 libhdb \
-	 libkadm5srv libkadm5clnt libgssapi libkafs
+SUBDIR+= libroken libvers libcom_err libasn1
 
 .if (${MKKERBEROS4} != "no")
 # KTH Kerberos 4 libraries
@@ -84,6 +83,11 @@ SUBDIR+=	.WAIT
 
 SUBDIR+=	libcdk 		# depends on libedit
 
+.if (${MKKERBEROS} != "no")
+# Heimdal Kerberos 5 libraries depending on libkrb5 and more
+SUBDIR+=	libgssapi libhdb libkadm5srv libkadm5clnt libkafs libsl libss
+.endif
+
 .if (${MKPAM} != "no")
 SUBDIR+=	libpam		# depends on libkrb5 and more
 .endif
diff --git a/lib/libasn1/Makefile b/lib/libasn1/Makefile
index bafe1e8270e9..a6fb93436231 100644
--- a/lib/libasn1/Makefile
+++ b/lib/libasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -10,6 +10,8 @@ DIST=		${NETBSDSRCDIR}/crypto/dist
 WARNS?=		1
 LIB=		asn1
 
+LIBDPLIBS=	com_err	${.CURDIR}/../libcom_err
+
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=		cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=	${COMPILEETOBJ}/compile_et
diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index df6980b6257a..781f80ad7c7b 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -11,6 +11,11 @@ WARNS?=		1
 
 LIB=		gssapi
 
+LIBDPLIBS=	crypto	${.CURDIR}/../libcrypto \
+		krb5	${.CURDIR}/../libkrb5 \
+		asn1	${.CURDIR}/../libasn1 \
+		roken	${.CURDIR}/../libroken
+
 SRCS	 =			\
 	8003.c			\
 	accept_sec_context.c	\
diff --git a/lib/libhdb/Makefile b/lib/libhdb/Makefile
index 49f42666265a..56d5fc457d2d 100644
--- a/lib/libhdb/Makefile
+++ b/lib/libhdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -11,6 +11,10 @@ WARNS?=		1
 
 LIB=		hdb
 
+LIBDPLIBS=	krb5	${.CURDIR}/../libkrb5 \
+		asn1	${.CURDIR}/../libasn1 \
+		roken	${.CURDIR}/../libroken
+
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=		cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=	${COMPILEETOBJ}/compile_et
diff --git a/lib/libkadm5clnt/Makefile b/lib/libkadm5clnt/Makefile
index c8fb3950f150..203d3fe9bac4 100644
--- a/lib/libkadm5clnt/Makefile
+++ b/lib/libkadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -11,6 +11,10 @@ WARNS?=		1
 
 LIB=		kadm5clnt
 
+LIBDPLIBS=	krb5	${.CURDIR}/../libkrb5 \
+		hdb	${.CURDIR}/../libhdb \
+		roken	${.CURDIR}/../libroken
+
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=		cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=	${COMPILEETOBJ}/compile_et
diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile
index a36fd9c6efb0..4a99b2ed26e8 100644
--- a/lib/libkadm5srv/Makefile
+++ b/lib/libkadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -13,6 +13,10 @@ WARNS?=		1
 
 LIB=		kadm5srv
 
+LIBDPLIBS=	krb5	${.CURDIR}/../libkrb5 \
+		hdb	${.CURDIR}/../libhdb \
+		roken	${.CURDIR}/../libroken
+
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=		cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=	${COMPILEETOBJ}/compile_et
diff --git a/lib/libkafs/Makefile b/lib/libkafs/Makefile
index c91d5edfc696..51e714815772 100644
--- a/lib/libkafs/Makefile
+++ b/lib/libkafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -11,6 +11,9 @@ WARNS?=		1
 
 LIB=		kafs
 
+LIBDPLIBS=	krb5	${.CURDIR}/../libkrb5 \
+		roken	${.CURDIR}/../libroken
+
 SRCS=		afssys.c afskrb.c afskrb5.c common.c
 
 INCS=		kafs.h
diff --git a/lib/libsl/Makefile b/lib/libsl/Makefile
index 6d40f83c656f..30215ead0e48 100644
--- a/lib/libsl/Makefile
+++ b/lib/libsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -8,6 +8,10 @@ DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH:		${DIST}/heimdal/lib/sl
 
 LIB=		sl
+
+LIBDPLIBS=	edit ${.CURDIR}/../libedit \
+		termcap ${.CURDIR}/../libterm
+
 SRCS=		sl.c
 INCS=		sl.h
 INCSDIR=	/usr/include/krb5
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index e223466a99f4..1228142339d0 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/10 03:11:17 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/17 21:43:16 christos Exp $
 
 NOLINT=		# defined
 
@@ -10,6 +10,11 @@ DIST=		${NETBSDSRCDIR}/crypto/dist
 WARNS?=		1
 
 LIB=		ss
+
+LIBDPLIBS=	edit ${.CURDIR}/../libedit \
+		termcap ${.CURDIR}/../libterm \
+		com_err	${.CURDIR}/../libcom_err
+
 SRCS=		sl.c ss.c
 INCS=		ss.h
 INCSDIR=	/usr/include/krb5