Index: head/libexec/rc/rc.d/Makefile
===================================================================
--- head/libexec/rc/rc.d/Makefile
+++ head/libexec/rc/rc.d/Makefile
@@ -242,14 +242,17 @@
 .if ${MK_KERBEROS} != "no"
 CONFS+=		ipropd_master
 CONFS+=		ipropd_slave
-_kadmind=	kadmind
-_kdc=		kdc
-_kfd=		kfd
-_kpasswdd=	kpasswdd
 
 DIRS+=	VAR_HEMIDAL
 VAR_HEMIDAL=	/var/heimdal
 VAR_HEMIDAL_MODE=	700
+.endif
+
+.if ${MK_KERBEROS_SCRIPTS} != "no"
+_kadmind=	kadmind
+_kdc=		kdc
+_kfd=		kfd
+_kpasswdd=	kpasswdd
 .endif
 
 .if ${MK_MAIL} != "no"
Index: head/share/mk/bsd.opts.mk
===================================================================
--- head/share/mk/bsd.opts.mk
+++ head/share/mk/bsd.opts.mk
@@ -55,6 +55,7 @@
     INCLUDES \
     INSTALLLIB \
     KERBEROS \
+    KERBEROS_SCRIPTS \
     MAKE_CHECK_USE_SANDBOX \
     MAN \
     MANCOMPRESS \
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -237,6 +237,7 @@
     INET \
     INET6 \
     KERBEROS \
+    KERBEROS_SCRIPTS \
     KVM \
     NETGRAPH \
     PAM \
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc
+++ head/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3152,13 +3152,9 @@
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
-OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
-OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
-OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
-OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
@@ -3878,6 +3874,13 @@
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
+.endif
+
+.if ${MK_KERBEROS_SCRIPTS} == no
+OLD_FILES+=usr/libexec/kadmind
+OLD_FILES+=usr/libexec/kdc
+OLD_FILES+=usr/libexec/kfd
+OLD_FILES+=usr/libexec/kpasswdd
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} == no