diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 6702f996e007..bbf171e19dd0 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	cbsd
 DISTVERSION=	13.1.2
+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
+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
 RUN_DEPENDS+=	sysrc:sysutils/sysrc
 .else
 PLIST_SUB+=	FBSD=""
 .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/pkg-deinstall.in b/sysutils/cbsd/files/pkg-deinstall.in
deleted file mode 100644
index 4bf3facc595b..000000000000
--- a/sysutils/cbsd/files/pkg-deinstall.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-case $2 in
-POST-DEINSTALL)
-    echo
-    echo "The cbsd package has been deleted."
-    echo
-    echo "If you are *not* upgrading this package, you may want to"
-    echo "remove the following to complete the deinstallation process:"
-    echo
-    echo "1) Records in /etc/rc.conf"
-    echo
-    echo "  cbsdrsyncd_enable=\"YES\""
-    echo "  cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\""
-    echo "  cbsdd_enable=\"YES\""
-    echo "  devfs_load_rulesets=\"YES\""
-    echo "  cbsd_workdir=\"\$workdir\""
-    echo "  rcshutdown_timeout=\"900\""
-    echo "  sshd_flags=\"-oPort=22222\""
-    echo
-    echo "2) Remove %%LOCALBASE%%/etc/sudoers.d/cbsd_sudoers"
-    echo
-  ;;
-esac
diff --git a/sysutils/cbsd/files/pkg-message.in b/sysutils/cbsd/files/pkg-message.in
index e1ddcadd7bf4..d78189ebe990 100644
--- a/sysutils/cbsd/files/pkg-message.in
+++ b/sysutils/cbsd/files/pkg-message.in
@@ -1,17 +1,39 @@
 [
 { type: install
   message: <<EOM
 cbsd is now installed, but requires additional setup steps:
 
 Upon initial installation, run:
 
   env workdir="/path" %%PREFIX%%/cbsd/sudoexec/initenv
 
 Where /path is the path to the cbsd workdir, e.g.: /usr/jails
 
 For upgrading an existing installation, run:
 
   cbsd initenv
+EOM
+},
+{ type: remove
+  message: <<EOM
+
+The cbsd package has been deleted."
+
+If you are *not* upgrading this package, you may want to"
+remove the following to complete the deinstallation process:"
+
+1) Records in /etc/rc.conf"
+
+  cbsdrsyncd_enable="YES"
+  cbsdrsyncd_flags="--config=\$workdir/etc/rsyncd.conf"
+  cbsdd_enable="YES"
+  devfs_load_rulesets="YES"
+  cbsd_workdir="$workdir"
+  rcshutdown_timeout="900"
+  sshd_flags="-oPort=22222"
+
+2) Remove %%LOCALBASE%%/etc/sudoers.d/cbsd_sudoers
+
 EOM
 }
 ]