diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -29,12 +29,8 @@
 	iovctl \
 	ip6addrctl \
 	ipsec \
-	${_kadmind} \
-	${_kdc} \
-	${_kfd} \
 	kld \
 	kldxref \
-	${_kpasswdd} \
 	ldconfig \
 	linux \
 	local \
@@ -287,19 +283,30 @@
 LPPACKAGE=	lp
 .endif
 
-.if ${MK_KERBEROS} != "no"
-CONFS+=		ipropd_master
-CONFS+=		ipropd_slave
-_kadmind=	kadmind
-_kdc=		kdc
-_kfd=		kfd
-_kpasswdd=	kpasswdd
+.if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} == "no"
+# Heimdal rc scripts
+CONFGROUPS+=	HEIMDAL
+HEIMDAL=	ipropd_master \
+		ipropd_slave \
+		kadmind \
+		kdc \
+		kfd \
+		kpasswdd
+HEIMDALPACKAGE=	kerberos
 
-DIRS+=	VAR_HEMIDAL
+DIRS+=		VAR_HEMIDAL
 VAR_HEMIDAL=	/var/heimdal
 VAR_HEMIDAL_MODE=	700
 .endif
 
+.if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} != "no"
+# MIT KRB5 rc scripts
+CONFGROUPS+=	KRB5
+KRB5=		kadmind \
+		kdc
+KRB5PACKAGE=	kerberos-kdc
+.endif
+
 .if ${MK_NIS} != "no"
 CONFGROUPS+=	YP
 YP=		ypbind \