Index: head/kerberos5/Makefile
===================================================================
--- head/kerberos5/Makefile	(revision 264155)
+++ head/kerberos5/Makefile	(revision 264156)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 SUBDIR=	doc lib libexec tools usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
 KPROGS=	lib/libpam \
 	secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
 
 # This target is used to rebuild these programs WITH Kerberos.
 kerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
 	${MAKE} cleandir; \
 	${MAKE} obj; \
 	${MAKE} depend; \
 	${MAKE} all; \
 	${MAKE} install
 .endfor
 
 # This target is used to rebuild these programs WITHOUT Kerberos.
 dekerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DWITHOUT_KERBEROS cleandir; \
-	${MAKE} -DWITHOUT_KERBEROS obj; \
-	${MAKE} -DWITHOUT_KERBEROS depend; \
-	${MAKE} -DWITHOUT_KERBEROS all; \
-	${MAKE} -DWITHOUT_KERBEROS install
+	${MAKE} MK_KERBEROS=no cleandir; \
+	${MAKE} MK_KERBEROS=no obj; \
+	${MAKE} MK_KERBEROS=no depend; \
+	${MAKE} MK_KERBEROS=no all; \
+	${MAKE} MK_KERBEROS=no install
 .endfor
 
 .include <bsd.subdir.mk>
Index: head/tools/bsdbox/Makefile.telnetd
===================================================================
--- head/tools/bsdbox/Makefile.telnetd	(revision 264155)
+++ head/tools/bsdbox/Makefile.telnetd	(revision 264156)
@@ -1,14 +1,14 @@
 # Build telnetd
 # Question - why is telnetds objects ending up in the srcdir? -adrian
 
 # This won't work yet - because telnetd relies on libtelnet.a which includes
 # kerberos support by default; building telnetd without kerberos support
 # requires the cross-build world to be built the same.
 #   -adrian
 
 # $FreeBSD$
 
 CRUNCH_PROGS_libexec+=	telnetd
 CRUNCH_PROGS_usr.bin+=	telnet
 CRUNCH_LIBS+=		-lkrb5 -lhx509 -lasn1 -lcom_err -lroken -ltelnetd
-# CRUNCH_BUILDOPTS_telnetd=	WITHOUT_KERBEROS_SUPPORT=yes
+# CRUNCH_BUILDOPTS_telnetd=	MK_KERBEROS_SUPPORT=no