diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index ed01c751..3f8f56a1 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.144 2011/07/07 14:43:49 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.145 2011/07/07 18:17:50 ajacoutot Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -50,6 +50,9 @@ ldapd_flags=NO		# for normal use: ""
 inetd_flags=""		# for normal use: ""
 rwhod_flags=NO		# for normal use: ""
 portmap_flags=NO	# for normal use: ""
+kdc_flags=NO		# for normal use: "" see 'info heimdal' for help
+kadmind_flags=NO	# for normal use: ""
+kpasswdd_flags=NO	# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
@@ -83,8 +86,6 @@ portmap=NO		# Note: inetd(8) rpc services need portmap too
 check_quotas=YES	# NO may be desirable in some YP environments
 accounting=NO		# process accounting (using /var/account/acct)
 
-krb5_master_kdc=NO	# KerberosV master KDC. Run 'info heimdal' for help.
-krb5_slave_kdc=NO	# KerberosV slave KDC.
 afs=NO			# mount and run afs
 
 # Multicast routing configuration
@@ -114,11 +115,14 @@ rc_scripts=
 
 local_rcconf="/etc/rc.conf.local"
 
-unset inetd_flags rwhod_flags portmap_flags
+unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags kpasswdd_flags
 
 [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
 
-# backward compatibility for inetd, portmap and rwhod
+# backward compatibility
 : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
 : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}
 : ${portmap_flags=$([ X"${portmap-NO}" = XYES ] || echo NO)}
+: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
+: ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
+: ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
diff --git a/src/etc/rc.d/kadmind b/src/etc/rc.d/kadmind
new file mode 100644
index 00000000..8345b58a
--- /dev/null
+++ b/src/etc/rc.d/kadmind
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: kadmind,v 1.1 2011/07/07 18:17:50 ajacoutot Exp $
+
+daemon="/usr/libexec/kadmind"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1
diff --git a/src/etc/rc.d/kdc b/src/etc/rc.d/kdc
new file mode 100644
index 00000000..f40c3920
--- /dev/null
+++ b/src/etc/rc.d/kdc
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: kdc,v 1.1 2011/07/07 18:17:50 ajacoutot Exp $
+
+daemon="/usr/libexec/kdc"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1
diff --git a/src/etc/rc.d/kpasswdd b/src/etc/rc.d/kpasswdd
new file mode 100644
index 00000000..cdb88de9
--- /dev/null
+++ b/src/etc/rc.d/kpasswdd
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: kpasswdd,v 1.1 2011/07/07 18:17:50 ajacoutot Exp $
+
+daemon="/usr/libexec/kpasswdd"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1