diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index 3a6dfe1d0390..d62356fddb3c 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -8,6 +8,10 @@ NOPIC=		yes
 
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
+.if defined(MAKE_KERBEROS4)
+SRCS+=		kerberos.c
+CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
+.endif
 SRCS+=		kerberos5.c
 
 #WARNS?=		2
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index f44a63af563e..623cbfb6fe39 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -16,10 +16,18 @@ CFLAGS+=	-DKRB5
 
 WARNS?=		2
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+DPADD=
+LDADD=
+
+.if defined(MAKE_KERBEROS4)
+DPADD+=		${LIBKRB} ${LIBCOM_ERR}
+LDADD+=		-lkrb -lcom_err
+.endif
+
+DPADD+=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
 		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
 		${LIBCRYPT} ${LIBPAM}
-LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+LDADD+=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
 		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
 		-L${ROKENOBJDIR} -lroken -lcom_err \
 		-lcrypt ${MINUSLPAM}
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 03c0fa903bd5..79f7f11713c0 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -13,10 +13,18 @@ CFLAGS+=	-DKRB5
 
 WARNS?=		2
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+DPADD=
+LDADD=
+
+.if defined(MAKE_KERBEROS4)
+DPADD+=		${LIBKRB} ${LIBCOM_ERR}
+LDADD+=		-lkrb -lcom_err
+.endif
+
+DPADD+=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
 		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
 		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lmp \
+LDADD+=		-ltermcap ${LIBTELNET} -lmp \
 		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
 		-L${ROKENOBJDIR} -lroken \
 		-lcrypto -lcrypt -lipsec ${MINUSLPAM}