diff --git a/security/kstart/Makefile b/security/kstart/Makefile
index d0af6e19d9f9..eb3b62bef3db 100644
--- a/security/kstart/Makefile
+++ b/security/kstart/Makefile
@@ -1,24 +1,26 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kstart
 DISTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://archives.eyrie.org/software/kerberos/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Automated Kerberos ticket cache and keytab management utilities
 
+USE_RC_SUBR=	${PORTNAME}
 HAS_CONFIGURE=	yes
 PLIST_FILES=	bin/k5start bin/krenew \
 		man/man1/k5start.1.gz man/man1/krenew.1.gz
 
 do-install:
 	@${GZIP_CMD} ${WRKSRC}/k5start.1
 	@${GZIP_CMD} ${WRKSRC}/krenew.1
 	${INSTALL_PROGRAM} ${WRKSRC}/k5start ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/krenew ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/k5start.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/krenew.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/kstart/files/kstart.in b/security/kstart/files/kstart.in
new file mode 100644
index 000000000000..01059f1d1c85
--- /dev/null
+++ b/security/kstart/files/kstart.in
@@ -0,0 +1,60 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: kstart
+# REQUIRE: DAEMON LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable kstart:
+# kstart_enable (bool):		Set to YES to enable kstart
+# 				Default: NO
+# kstart_flags (str):		Extra flags passed to kstart
+#				Default: -LUFK 120
+# kstart_keytab (str):		Default keytab file to use
+#				Default: /etc/krb5.keytab
+#
+# To enable multi-instance support, use:
+# kstart_instances="name1 name2"
+# kstart_name1_keytab="/path/to/keytab"
+
+
+. /etc/rc.subr
+
+name="kstart"
+rcvar=kstart_enable
+
+command="%%PREFIX%%/bin/k5start"
+pidfile="/var/run/kstart.pid"
+
+load_rc_config $name
+
+[ -z "$kstart_enable" ]		&& kstart_enable="NO"
+[ -z "$kstart_keytab" ]		&& kstart_keytab="/etc/krb5.keytab"
+[ -z "$kstart_flags" ]		&& kstart_flags="-LUFK 120"
+
+if [ -n "$kstart_instances" ]; then
+  _1=$1
+  if [ $# -gt 1 ]; then shift; kstart_instances=$*; fi
+  kstart_keytab=""
+  kstart_flags=""
+  rc=0
+  for i in ${kstart_instances}; do
+	eval _keytab=\$kstart_${i}_keytab
+	if [ -z "$_keytab" ]; then
+	    _keytab="/etc/krb5.keytab"
+	fi
+	eval _flags=\$kstart_${i}_flags
+	if [ -z "$_flags" ]; then
+	    _flags="-LUFK 120"
+	fi
+	eval pidfile="/var/run/kstart_${i}.pid"
+	command_args="-bf $_keytab $_flags -p $pidfile"
+        run_rc_command "$_1"
+        if [ $? -ne 0 ]; then rc=1; fi
+	unset _pidcmd _rc_restart_done
+   done
+   exit $rc
+else
+	command_args="-bf $kstart_keytab $kstart_flags -p $pidfile"
+	run_rc_command "$1"
+fi