diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 953e5347e08..ac0abc8e85d 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -87,8 +87,8 @@ SRCS+=	kpasswd_standalone.c
 
 CFLAGS+=	-DKERBEROS
 # XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
-DPADD=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
-LDADD=	-lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil
+DPADD=	${LIBKADM} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
+LDADD=	-lkadm -lkrb -lcrypto -lcrypt -lrpcsvc -lcom_err -lutil
 DISTRIBUTION=	krb4
 .endif
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 97de1dac89b..a0353dbdf3f 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -11,13 +11,13 @@ INSTALLFLAGS=-fschg
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
+LDADD=	-lutil -lkrb -lcrypto -lcrypt -lcom_err
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index fb3f3d44fc5..51ef079260f 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -73,7 +73,7 @@ static const char rcsid[] =
 #include <err.h>
 
 #ifdef KERBEROS
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 
 #include "../../bin/rcp/pathnames.h"
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index ede91df5b93..ff6d61e79a4 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -14,8 +14,8 @@ CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lutil -lkrb -lcrypto -lcrypt -lcom_err
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 69579ffe924..95b06525cdc 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -69,7 +69,7 @@ static const char rcsid[] =
 #include "pathnames.h"
 
 #ifdef KERBEROS
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include "krb.h"
 
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 91ac2a81e50..99b44fbb133 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -15,8 +15,8 @@ CFLAGS+= -Wall
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DKERBEROS
-DPADD+=	${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
-LDADD+=	-lkrb -ldes -lcom_err
+DPADD+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
+LDADD+=	-lkrb -lcrypto -lcom_err
 DISTRIBUTION=	krb4
 .endif
 
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 2e5651e9bfc..1745067126e 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -70,7 +70,7 @@ static const char rcsid[] =
 #endif
 
 #ifdef KERBEROS
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <netdb.h>
 
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 73bb1b00cd5..563eb7bafc4 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -42,12 +42,8 @@ CFLAGS+=-DSKEY
 CFLAGS+=-I${.CURDIR}/../../lib
 CFLAGS+=-DINET6
 
-#CFLAGS+= -DKRB4
-
 DPADD=	${LIBTERMCAP} ${LIBTELNET}
 LDADD=	-ltermcap -ltelnet
-#DPADD+=	${LIBKRB} ${LIBDES}
-#LDADD+=	-lkrb -ldes
 
 .if !defined(RELEASE_CRUNCH)
 CFLAGS+=-DIPSEC