diff --git a/www/privatebin/Makefile b/www/privatebin/Makefile
index 742b3b78be95..683071fd9fef 100644
--- a/www/privatebin/Makefile
+++ b/www/privatebin/Makefile
@@ -1,33 +1,37 @@
 PORTNAME=	privatebin
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	www security
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Simple end-to-end encrypting zero-knowledge paste-bin server
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		cpe php
 
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME}
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_PHP=	gd hash json zlib
 USE_GITHUB=	yes
 GH_PROJECT=	PrivateBin
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:%%DATADBDIR%%:/var/db/${PORTNAME}:' \
 		${WRKSRC}/index.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${MV} ${STAGEDIR}/${WWWDIR}/*.md ${STAGEDIR}/${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/privatebin/pkg-deinstall b/www/privatebin/files/pkg-message.in
similarity index 55%
rename from www/privatebin/pkg-deinstall
rename to www/privatebin/files/pkg-message.in
index 0d1e7d2dba0e..1aaf3b9a6955 100644
--- a/www/privatebin/pkg-deinstall
+++ b/www/privatebin/files/pkg-message.in
@@ -1,15 +1,14 @@
-#!/bin/sh
-
-PORTNAME=${1%-*}
-
-[ "$2" = DEINSTALL ] && cat <<***EOM
+[
+{ type: remove
+  message: <<EOM
 ------------------------------------------------------------------------------
 
-If you are no longer using the $PORTNAME port, then manually delete
+If you are no longer using the %%PORTNAME%% port, then manually delete
 the following directory and all its contents:
 
-	/var/db/$PORTNAME
+	/var/db/%%PORTNAME%%
 
 ------------------------------------------------------------------------------
-***EOM
-exit 0
+EOM
+}
+]