diff --git a/libexec/kadmind/Makefile b/libexec/kadmind/Makefile
index 2557806c4bb6..24959a186620 100644
--- a/libexec/kadmind/Makefile
+++ b/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:29 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2003/08/23 23:03:42 lha Exp $
 
 NOLINT=		# defined
 
@@ -17,8 +17,8 @@ CPPFLAGS+= -DKRB4
 CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
 SRCS+= 	version4.c
 
-KRB4LDADD= -lkadm -lkrb
-KRB4DPADD= ${LIBKADM} ${LIBKRB}
+KRB4LDADD= -lkadm -lkrb -ldes
+KRB4DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES}
 .endif
 
 SRCS+= 	kadmind.c				\
diff --git a/usr.bin/kinit/Makefile b/usr.bin/kinit/Makefile
index 1a76f4dc6c3e..8a3dec08580f 100644
--- a/usr.bin/kinit/Makefile
+++ b/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:33 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2003/08/23 23:03:44 lha Exp $
 
 NOLINT= # defined
 
@@ -19,8 +19,8 @@ foo:
 .if ${MKKERBEROS4} != "no"
 CPPFLAGS+= -DKRB4
 CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
-KRB4LDADD= -lkrb
-KRB4DPADD= ${LIBKRB}
+KRB4LDADD= -lkrb -ldes
+KRB4DPADD= ${LIBKRB} ${LIBDES}
 .endif
 
 CPPFLAGS+= -I.					\
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 0282146bd776..593b6a32b131 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2003/07/23 08:01:35 itojun Exp $
+#	$NetBSD: Makefile,v 1.40 2003/08/23 23:03:43 lha Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -27,8 +27,8 @@ LDADD+= -lkrb5 -lasn1
 .if (${USE_KERBEROS4} != "no")
 SRCS+= klogin.c
 CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
-DPADD+=	${LIBKRB}
-LDADD+= -lkrb
+DPADD+=	${LIBKRB} ${LIBDES}
+LDADD+= -lkrb -ldes
 .endif
 
 .if (${USE_KERBEROS4} != "no" || ${USE_KERBEROS} != "no")
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 3165f26d176a..51f33c3f97ee 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2003/07/24 15:31:57 itojun Exp $
+#	$NetBSD: Makefile,v 1.17 2003/08/23 23:03:44 lha Exp $
 
 .include <bsd.own.mk>
 
@@ -16,9 +16,14 @@ CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5
 LDADD+=	-lkrb5 -lkafs -lasn1
 DPADD+=	${LIBKRB5} ${LIBKAFS} ${LIBASN1}
 
+.if ${MKKERBEROS4} != "no"
 CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV
-LDADD+=	-lkrb -lcom_err -lroken
-DPADD+=	${LIBKRB} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+=	-lkrb -ldes
+DPADD+=	${LIBKRB} ${LIBDES}
+.endif
+
+LDADD+=	-lcom_err -lroken
+DPADD+=	${LIBCOM_ERR} ${LIBROKEN}
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index f4377242931d..810b92d6a15e 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2003/07/24 15:31:57 itojun Exp $
+#	$NetBSD: Makefile,v 1.19 2003/08/23 23:03:45 lha Exp $
 
 .include <bsd.own.mk>
 
@@ -22,10 +22,15 @@ SRCS+=	auth-krb5.c auth2-krb5.c
 LDADD+=	-lkrb5 -lkafs -lasn1
 DPADD+=	${LIBKRB5} ${LIBKAFS} ${LIBASN1}
 
+.if ${MKKERBEROS4} != "no"
 CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV
 SRCS+=	auth-krb4.c
-LDADD+=	-lkrb -lcom_err -lroken
-DPADD+=	${LIBKRB} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+=	-lkrb -ldes
+DPADD+=	${LIBKRB} ${LIBDES}
+.endif
+
+LDADD+=	-lcom_err -lroken
+DPADD+=	${LIBCOM_ERR} ${LIBROKEN}
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index a12145364411..be0d331cb5e2 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2003/08/20 14:11:17 christos Exp $
+#	$NetBSD: Makefile,v 1.33 2003/08/23 23:03:44 lha Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -33,8 +33,8 @@ LDADD+= -lkrb5 -lasn1
 
 .if (${USE_KERBEROS4} != "no")
 CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
-DPADD+=	${LIBKRB}
-LDADD+= -lkrb
+DPADD+=	${LIBKRB} ${LIBDES}
+LDADD+= -lkrb -ldes
 .endif
 
 DPADD+=	${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
diff --git a/usr.sbin/kdc/Makefile b/usr.sbin/kdc/Makefile
index ca48f6ab245a..7a7e94ea2bce 100644
--- a/usr.sbin/kdc/Makefile
+++ b/usr.sbin/kdc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/23 08:01:41 itojun Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/23 23:03:45 lha Exp $
 
 NOLINT= # defined
 
@@ -14,8 +14,8 @@ PROG= kdc
 .if ${MKKERBEROS4} != "no"
 CPPFLAGS+= -DKRB4
 CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
-KRB4LDADD= -lkrb
-KRB4DPADD= ${LIBKRB}
+KRB4LDADD= -lkrb -ldes
+KRB4DPADD= ${LIBKRB} ${LIBDES}
 
 SRCS+= 	kaserver.c