Index: head/net/dhcp6/Makefile
===================================================================
--- head/net/dhcp6/Makefile	(revision 477304)
+++ head/net/dhcp6/Makefile	(revision 477305)
@@ -1,35 +1,36 @@
 # Created by: Munechika SUMIKAWA <sumikawa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dhcp6
 PORTVERSION=	20080615.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	KAME DHCP6 client, server, and relay
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
 GH_PROJECT=	wide-dhcpv6
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc \
 		--with-localdbdir=/var/db
 USE_RC_SUBR=	dhcp6c dhcp6relay dhcp6s
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} \
 	    dhcp6c.conf.sample dhcp6s.conf.sample \
 	    ${STAGEDIR}${PREFIX}/etc
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/dhcp6/files/dhcp6c.in
===================================================================
--- head/net/dhcp6/files/dhcp6c.in	(revision 477304)
+++ head/net/dhcp6/files/dhcp6c.in	(revision 477305)
@@ -1,52 +1,59 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: dhcp6c
 # REQUIRE: DAEMON
 # BEFORE: NETWORKING
 # KEYWORD: shutdown
 
 # Add the following lines to
 # /etc/rc.conf.d/dhcp6c /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # dhcp6c_enable (bool):			Set to NO by default.
 #		Set it to YES to enable dhcp6c.
 # dhcp6c_config (path):			Set to %%PREFIX%%/etc/dhcp6c.conf
 #		by default.
+# dhcp6c_dhcp6cctlkey (path):		Set to %%PREFIX%%/etc/dhcp6cctlkey
+#		by default.
 # dhcp6c_pidfile (path):		Set to /var/run/dhcp6c.pid
 #		by default.
 # dhcp6c_interfaces (NIC list):		Not defined by default.
 #		Set it to the network interface(s) where dhcp6c should work on.
 # dhcp6c_flags (additional arguments):	Not defined by default.
 #
 
 . /etc/rc.subr
 
 name="dhcp6c"
 rcvar=dhcp6c_enable
 
 command="%%PREFIX%%/sbin/${name}"
 start_precmd="${name}_precmd"
 
 load_rc_config $name
 
 : ${dhcp6c_enable="NO"}
 : ${dhcp6c_config="%%PREFIX%%/etc/${name}.conf"}
+: ${dhcp6c_dhcp6cctlkey="%%PREFIX%%/etc/dhcp6cctlkey"}
 : ${dhcp6c_pidfile="/var/run/${name}.pid"}
 
 required_files="${dhcp6c_config}"
 pidfile="${dhcp6c_pidfile}"
 command_args="-c ${dhcp6c_config} -p ${dhcp6c_pidfile} ${dhcp6c_flags} ${dhcp6c_interfaces}"
 
 dhcp6c_precmd()
 {
 	if [ -z ${dhcp6c_interfaces} ]; then
 		warn "dhcp6c_interfaces is not set."
 		return 1
+	fi
+	if [ ! -s ${dhcp6c_dhcp6cctlkey} ]; then
+		echo "Creating ${dhcp6c_dhcp6cctlkey}"
+		(umask 077 ; openssl rand -base64 48 > ${dhcp6c_dhcp6cctlkey})
 	fi
 }
 
 run_rc_command "$1"