diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 842274181e0a..08c665a78a3f 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,53 +1,52 @@
 
 PORTNAME=	cbsd
-DISTVERSION=	13.0.3
+DISTVERSION=	13.0.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Yet another FreeBSD Jail, XEN and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rsync:net/rsync \
-		sudo:security/sudo \
+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 \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-LIB_DEPENDS=	libssh2.so:security/libssh2 \
-		libsqlite3.so: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
+USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \
+		cbsd-statsd-jail
 
-SUB_FILES=	pkg-message pkg-deinstall
+SUB_FILES=	pkg-deinstall pkg-message
 
-CBSD_HOME?=	${PREFIX}/cbsd
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
-USERS=	${PORTNAME}
-GROUPS=	${PORTNAME}
+BIN_FILES=	bin/cbsdsh/mknodes bin/cbsdsh/mksyntax
 
-BIN_FILES=	\
-		bin/cbsdsh/mknodes \
-		bin/cbsdsh/mksyntax
+CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
 
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
 	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
 .for i in ${BIN_FILES}
 	${STRIP_CMD} ${STAGEDIR}${CBSD_HOME}/${i}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
 	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \
 	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${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/distinfo b/sysutils/cbsd/distinfo
index 03761ff8fcf8..3e8fb0c45217 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616348736
-SHA256 (cbsd-cbsd-13.0.3_GH0.tar.gz) = d22888dc83f190a2dc21f7b0d76d1337bf89b7cda019e0ad6da342abc105cdfa
-SIZE (cbsd-cbsd-13.0.3_GH0.tar.gz) = 5352647
+TIMESTAMP = 1618302000
+SHA256 (cbsd-cbsd-13.0.4_GH0.tar.gz) = bda5e28c242c3abf83432716fa2db2631ca7f9b88d7a2fe9031b621d903713bc
+SIZE (cbsd-cbsd-13.0.4_GH0.tar.gz) = 5370055