diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index cc6770133084..3e4352f0da2d 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	cbsd
 DISTVERSION=	15.0.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	fbsd-ports@convectix.com
 COMMENT=	Yet another FreeBSD Jail, XEN and Bhyve Management Utility
 WWW=		https://github.com/cbsd/cbsd
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjq.so:textproc/jq \
 		libonig.so:devel/oniguruma \
 		libssh2.so:security/libssh2
 RUN_DEPENDS=	curl:ftp/curl \
 		jq:textproc/jq \
 		rsync:net/rsync
 
 USES=		autoreconf:build compiler:c++11-lang gmake pkgconfig:both sqlite sudo
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \
 		cbsd-statsd-jail
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == x86_64
 PLIST_SUB+=	X86=""
 .else
 PLIST_SUB+=	X86="@comment "
 .endif
 
 .if ${OPSYS} != FreeBSD
 PLIST_SUB+=	FBSD="@comment "
 LIB_DEPENDS+=	libelf.so:devel/libelf
 .else
 PLIST_SUB+=	FBSD=""
 .endif
 
 do-install:
 	@${ECHO_MSG} "Installing in ${CBSD_HOME}"
 	${CP} -a ${WRKSRC} ${STAGEDIR}${CBSD_HOME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/misc/src/sipcalc/sipcalc \
 		${STAGEDIR}${PREFIX}/cbsd/misc
 	${INSTALL_PROGRAM} ${WRKSRC}/misc/src/cbsd_md5/cbsd_md5 \
 		${STAGEDIR}${PREFIX}/cbsd/misc
 	${RM} -r ${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
 	${RM} -rf ${STAGEDIR}${PREFIX}/cbsd/share/docs
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 \
 		${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
 	${RLN} ${STAGEDIR}${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 f4e7b4c8d00e..16634c8ad791 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -1,126 +1,129 @@
 #!/bin/sh
 #
 # PROVIDE: cbsdd
 # REQUIRE: LOGIN FILESYSTEMS cleanvar 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
+export NO_CIX_HISTORY=yes
 # disable interactive question
 export NOINTER=1
 # always answer 'no'
 export ALWAYS_NO=1
 
-globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
+[ -z "${CIX_DISTDIR}" ] && CIX_DISTDIR="%%PREFIX%%/cbsd"
+[ -z "${CIX_BIN}" ] && CIX_BIN="%%PREFIX%%/bin/cbsd"
+
+globalconf=${cbsd_globalconf:-"${CIX_DISTDIR}/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}
 . ${subrdir}/nc.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
+	${CIX_BIN} task mode=flushall > /dev/null 2>&1
 	. ${subrdir}/initenv.subr
 	. ${inventory}
 
-	%%PREFIX%%/bin/cbsd sysinv mode=update
-	%%PREFIX%%/bin/cbsd netinv
+	${CIX_BIN} sysinv mode=update
+	${CIX_BIN} 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
+	[ -n "${nat_enable}" ] && ${CIX_BIN} naton
+	${miscdir}/daemonize ${CIX_BIN} ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
 {
-	${rcddir}/jails-astart stop
-	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
+	${CIX_BIN} ${rcddir}/jails-astart stop
+	[ -n "${nat_enable}" ] && ${CIX_BIN} 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"