diff -ruN cbsd.bak/Makefile cbsd/Makefile
--- cbsd.bak/Makefile	2014-08-14 22:17:03.000000000 +0400
+++ cbsd/Makefile	2014-08-14 22:25:54.000000000 +0400
@@ -1,7 +1,7 @@
 # $FreeBSD: head/sysutils/cbsd/Makefile 363136 2014-07-28 12:29:50Z marino $
 
 PORTNAME=	cbsd
-PORTVERSION=	10.0.6
+PORTVERSION=	10.0.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -17,7 +17,7 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	olevole
-GH_COMMIT=	0946415
+GH_COMMIT=	74d433e
 
 USE_RC_SUBR=	cbsdd cbsdrsyncd
 
diff -ruN cbsd.bak/distinfo cbsd/distinfo
--- cbsd.bak/distinfo	2014-07-13 16:02:59.000000000 +0400
+++ cbsd/distinfo	2014-08-14 22:26:04.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (cbsd-10.0.6.tar.gz) = 378a0f04abb562eb21b985034f4b74d0ff2e57161800b3c9e748e0ff4633736a
-SIZE (cbsd-10.0.6.tar.gz) = 383249
+SHA256 (cbsd-10.0.7.tar.gz) = b910bf77128764e8fcb5a09c009ff4efc9554faf96c9d5ee5ff1621147709c6d
+SIZE (cbsd-10.0.7.tar.gz) = 399325
diff -ruN cbsd.bak/files/cbsdd.in cbsd/files/cbsdd.in
--- cbsd.bak/files/cbsdd.in	2014-07-13 16:02:59.000000000 +0400
+++ cbsd/files/cbsdd.in	2014-08-14 22:11:21.000000000 +0400
@@ -60,6 +60,7 @@
 command_args="&"
 
 cbsdd_prestart() {
+	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
 	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
@@ -67,7 +68,7 @@
 	. ${inventory}
 
 	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
-	/usr/sbin/daemon ${rcddir}/jails-astart start
+	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
diff -ruN cbsd.bak/files/cbsdrsyncd.in cbsd/files/cbsdrsyncd.in
--- cbsd.bak/files/cbsdrsyncd.in	2014-08-14 22:14:46.000000000 +0400
+++ cbsd/files/cbsdrsyncd.in	2014-08-14 22:22:19.000000000 +0400
@@ -10,6 +10,7 @@
 #
 
 . /etc/rc.subr
+. /etc/rc.conf
 
 name="cbsdrsyncd"
 rcvar=cbsdrsyncd_enable