diff --git a/security/cvechecker/Makefile b/security/cvechecker/Makefile
index d679273b93df..243196c47c00 100644
--- a/security/cvechecker/Makefile
+++ b/security/cvechecker/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	cvechecker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.9
 PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Check CVE database for vulnerabilities affecting installed packages
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libconfig.so:devel/libconfig
 RUN_DEPENDS=	bash:shells/bash
 
 MAKE_ENV+=	LDADD=-largp
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME}
 
 USES=		autoreconf pkgconfig shebangfix
 
 SHEBANG_FILES=	scripts/cverules scripts/cvegenversdat
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/db
 
 bash_OLD_CMD+=	/bin/sh
 
 OPTIONS_DEFINE=			DOCS
 OPTIONS_MULTI=			DB
 OPTIONS_MULTI_DB=		MYSQL SQLITE
 OPTIONS_DEFAULT=		SQLITE
 DB_DESC=			CVE Database
 
 MYSQL_USES=			mysql ssl
 MYSQL_CONFIGURE_ENABLE=		mysql
 
 SQLITE_USES=			sqlite
 SQLITE_CONFIGURE_ENABLE=	sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sjvermeu
 
 post-stage:
 		${MV} ${STAGEDIR}${PREFIX}/etc/cvechecker.conf ${STAGEDIR}${PREFIX}/etc/cvechecker.conf.sample
 
 .include <bsd.port.mk>
diff --git a/security/cvechecker/pkg-deinstall b/security/cvechecker/files/pkg-message.in
similarity index 55%
rename from security/cvechecker/pkg-deinstall
rename to security/cvechecker/files/pkg-message.in
index 0d1e7d2dba0e..120cae96ee68 100644
--- a/security/cvechecker/pkg-deinstall
+++ b/security/cvechecker/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
+}
+]