diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index ada761831e26..4187001f6b45 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	cbsd
 DISTVERSION=	13.0.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Yet another FreeBSD Jail, XEN and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libssh2.so:security/libssh2
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		rsync:net/rsync \
 		sqlite3:databases/sqlite3 \
 		sudo:security/sudo
 
 USES=		compiler:c++11-lang libedit pkgconfig:both
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \
 		cbsd-statsd-jail
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-deinstall pkg-message
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB=	X86=""
 .else
 PLIST_SUB=	X86="@comment "
 .endif
 
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
 	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
 	${INSTALL_PROGRAM} -s ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} -s ${WRKSRC}/misc/src/sipcalc/sipcalc \
 		${STAGEDIR}${PREFIX}/cbsd/misc/sipcalc
 	${RM} -rf ${STAGEDIR}${PREFIX}/cbsd/bin/cbsdsh \
 		${STAGEDIR}${PREFIX}/cbsd/bin/src \
 		${STAGEDIR}${PREFIX}/cbsd/lib \
 		${STAGEDIR}${PREFIX}/cbsd/misc/src \
 		${STAGEDIR}${PREFIX}/cbsd/sbin/src \
 		${STAGEDIR}${PREFIX}/cbsd/tools/src
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
 	@${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd
 
 .include <bsd.port.mk>
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index 77bc6d165018..7508dd6632bc 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -1,121 +1,121 @@
 #!/bin/sh
 #
 # PROVIDE: cbsdd
 # REQUIRE: LOGIN FILESYSTEMS sshd
 # KEYWORD: shutdown
 #
 # cbsdd_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=cbsdd
 rcvar=cbsdd_enable
 load_rc_config $name
 
 : ${cbsdd_enable="NO"}
 
 export workdir="${cbsd_workdir}"
 export NO_CBSD_HISTORY=yes
 globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
 
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
 fi
 
 if [ ! -f ${mdtools} ]; then
 	echo "cbsd: no such ${mdtools}";
 	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
 	echo "cbsd: no such ${subr}";
 	exit 1
 fi
 
 if [ ! -f ${localcbsdconf} ]; then
 	echo "cbsd: no such ${localcbsdconf}";
 	exit 1
 fi
 
 . ${globalconf}
 . ${mdtools}
 . ${subr}
 
 . ${localcbsdconf}
 
 start_precmd=${name}_prestart
 stop_precmd=${name}_prestop
 stop_cmd=${name}_stop
 status_cmd="${name}_status"
 restart_cmd=${name}_restart
 extra_commands="restart"
 
 command="${toolsdir}/cbsdd"
 pidfile="${cbsd_workdir}/var/run/$name.pid"
 command_args="&"
 
 cbsdd_prestart() {
 	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
-	. ${distdir}/initenv.subr
+	. ${subrdir}/initenv.subr
 	. ${inventory}
 
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
 	update_netinfo
 	${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'"
 	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd naton
 	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
 {
 	${rcddir}/jails-astart stop
 	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
 }
 
 cbsdd_stop()
 {
 	if [ -f "${pidfile}" ]; then
 		pids=$( pgrep -F ${pidfile} 2>&1 )
 		_err=$?
 		if [ ${_err} -eq  0 ]; then
 			kill -9 ${pids} && /bin/rm -f ${pidfile}
 		else
 			echo "pgrep: ${pids}"
 			return ${_err}
 		fi
 	fi
 }
 
 cbsdd_restart()
 {
 	if [ -f "${pidfile}" ]; then
 		pkill -9 -f ${pidfile} > /dev/null 2>&1
 		/bin/rm -f ${pidfile}
 	fi
 	run_rc_command "start"
 	exit 0
 }
 
 cbsdd_status()
 {
 	local _err
 
 	if [ -f "${pidfile}" ]; then
 		pids=$( pgrep -F ${pidfile} 2>&1 )
 		_err=$?
 		if [ ${_err} -eq  0 ]; then
 			echo "${name} is running as pid ${pids}."
 		else
 			echo "pgrep: ${pids}"
 			return ${_err}
 		fi
 	else
 		echo "${name} is not running."
 		return 1
 	fi
 }
 
 run_rc_command "$1"