diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index ce9f2f48b6e8..27e0c68e3589 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/16 14:17:29 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/04 03:26:50 assar Exp $
 #
 
 DISTNAME=	openldap-1.2.11
@@ -41,7 +41,7 @@ post-build:
 post-configure:
 	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-kerberos
 .else
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 9a8abc8ca4a9..52c77af56641 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2001/03/03 12:27:50 frueauf Exp $
+# $NetBSD: Makefile,v 1.87 2001/03/04 03:26:50 assar Exp $
 #
 
 DISTNAME=       fetchmail-5.7.0
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--without-ssl
 
 BUILD_DEFS+=	FETCHMAIL_USE_SSL
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-kerberos=yes
 .else
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index f3735a9c0d99..f00f444414af 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/02/17 18:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2001/03/04 03:26:50 assar Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-editor=${NMH_EDITOR}
 CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
 .endif
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=		# defined
 CONFIGURE_ARGS+=	--with-krb4
 .else
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 4f817de1386c..314fd3239b9a 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/02/17 18:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2001/03/04 03:26:51 assar Exp $
 #
 
 DISTNAME=		qpopper3.1.2
@@ -21,6 +21,11 @@ CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec \
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(KERBEROS)
+USE_KERBEROS=		# defined
+CONFIGURE_ARGS+=	--enable-kerberos
+.endif
+
 BUILD_DEFS+=		QPOPPER_SERVERMODE USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 12e7c32587aa..2914ffef772a 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.175 2001/02/26 18:09:41 lukem Exp $
+# $NetBSD: mk.conf.example,v 1.176 2001/03/04 03:26:52 assar Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -484,7 +484,7 @@
 #KERBEROS=
 # Used in many packages to specify use of a Kerberos (or compatible)
 # subsystem.  Requires Kerberos libraries in /usr/lib.
-# Possible: 4, 5, not defined
+# Possible: defined, not defined
 # Default: not defined
 
 #KERMIT_SUID_UUCP
diff --git a/net/radius/Makefile b/net/radius/Makefile
index c3cc4e0d3699..1c59a6c95ee2 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 18:19:31 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/04 03:26:51 assar Exp $
 #
 # Tempted to install another radius package?
 #
@@ -26,7 +26,7 @@ DIST_SUBDIR=	radius
 
 CFLAGS+=	-DHAVE_SETVBUF -DNOSHADOW
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=	yes
 CFLAGS+=	-DM_KERB -I/usr/include/kerberosIV
 RADLIBS=	-lkrb -ldes
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index a9004d0d0097..e321e7146918 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/25 04:18:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/04 03:26:51 assar Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -11,7 +11,7 @@ COMMENT=	Zephyr Messaging Service
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=	yes
 CONFIGURE_ARGS+="--with-krb4"
 CONFIGURE_ENV+=	CPPFLAGS=-I/usr/include/kerberosIV
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 1a9527156eb9..63709f45c50f 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:49:41 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/04 03:26:51 assar Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -52,20 +52,17 @@ CONFIGURE_ARGS+=	--disable-sia		# --- no SIA
 CONFIGURE_ARGS+=	--disable-srp		# --- no SRP
 CONFIGURE_ARGS+=	--disable-x509		# --- no X.509
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
-CONFIGURE_ARGS+=	--enable-krb4=${PREFIX}	# KERBEROS_V4
+.if defined(KERBEROS)
+USE_KERBEROS=		# defined
+CONFIGURE_ARGS+=	--enable-krb4=${PREFIX} --enable-gssapi=/usr # KERBEROS_V4
 DEPENDS+=		kth-krb4-*:../../security/kth-krb4
-PLIST_SRC+=		${PKGDIR}/PLIST.krb4
-.else
-CONFIGURE_ARGS+=	--disable-krb4		# --- no KERBEROS_V4
-.endif
-
-.if ${OPSYS} == "SunOS" || (defined(KERBEROS) && ${KERBEROS} == 5)
+PLIST_SRC+=		${PKGDIR}/PLIST.krb4 ${PKGDIR}/PLIST.krb5
+.elif ${OPSYS} == "SunOS"
 USE_KERBEROS=		# defined
 CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .else
-CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
+CONFIGURE_ARGS+=	--disable-krb4 --disable-gssapi # --- no KERBEROS_V4
 .endif
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index ce6cb9a8d357..d8b70634a551 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2001/02/25 04:18:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.89 2001/03/04 03:26:51 assar Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -103,7 +103,7 @@ DEPENDS+=		socks5-1.0.2:../../net/socks5
 # PATCHFILES+=		ssh-1.2.27-afs-kerberos.patch-1
 # MD5 (ssh-1.2.27-afs-kerberos.patch-1) = d440f74958d9c3805b76dbc13e97e87d
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=		yes
 CONFIGURE_ARGS+=	--with-krb4=/usr
 .endif
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 1472ee452235..f1a3a01e9146 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/04 03:26:52 assar Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -95,7 +95,7 @@ DEPENDS+=		socks5-1.0.2:../../net/socks5
 # PATCHFILES+=		ssh-1.2.27-afs-kerberos.patch-1
 # MD5 (ssh-1.2.27-afs-kerberos.patch-1) = d440f74958d9c3805b76dbc13e97e87d
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=		yes
 CONFIGURE_ARGS+=	--with-krb4=/usr
 .endif
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 5a607782fa94..108724423320 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/02/23 08:11:35 itojun Exp $
+# $NetBSD: Makefile,v 1.33 2001/03/04 03:26:52 assar Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
@@ -26,18 +26,11 @@ CONFIGURE_ARGS+=	--with-skey
 CONFIGURE_ARGS+=	--without-skey
 .endif
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
+.if defined(KERBEROS)
 USE_KERBEROS=		# defined
-CONFIGURE_ARGS+=	--with-kerb4
+CONFIGURE_ARGS+=	--with-kerb4 --with-kerb5
 .else
-CONFIGURE_ARGS+=	--without-kerb4
-.endif
-
-.if defined(KERBEROS) && ${KERBEROS} == 5
-USE_KERBEROS=		# defined
-CONFIGURE_ARGS+=	--with-kerb5
-.else
-CONFIGURE_ARGS+=	--without-kerb5
+CONFIGURE_ARGS+=	--without-kerb4 --without-kerb5
 .endif
 
 CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info