diff --git a/security/pwned-check/Makefile b/security/pwned-check/Makefile
index 19f0878214d7..72057c2e2450 100644
--- a/security/pwned-check/Makefile
+++ b/security/pwned-check/Makefile
@@ -1,28 +1,31 @@
 PORTNAME=	pwned-check
 PORTVERSION=	2.2
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	#
 DISTFILES=	#
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Check whether password is known to have been exposed in a data breach
 
 LICENSE=	BSD2CLAUSE
 
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME}
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/src
 
 SRC=		${.CURDIR}/src
 
 SUB_FILES=	${PORTNAME}.sh ${PORTNAME}.1 pkg-message
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/pwned-check/files/pkg-message.in b/security/pwned-check/files/pkg-message.in
index e12280d612c2..4a11c095cbc6 100644
--- a/security/pwned-check/files/pkg-message.in
+++ b/security/pwned-check/files/pkg-message.in
@@ -1,17 +1,29 @@
 [
 { type: install
   message: <<EOM
 This port needs a password hash database that is to be downloaded with
 the following command:
 
     pwned-check -u
 
 The database files will be installed into /var/db/pwned-check by default.
 This directory can be changed in %%PREFIX%%/etc/pwned-check.conf.
 
 The installation procedure will fetch 6 GB of compressed data and will
 temporarily need 18 GB of free space in that directory and 13 GB when
 the installation is complete.
 EOM
+},
+{ type : remove
+  message: <<EOM
+------------------------------------------------------------------------------
+
+If you are no longer using the %%PORTNAME%% port, then manually delete
+the following directory and all its contents:
+
+	/var/db/%%PORTNAME%%
+
+------------------------------------------------------------------------------
+EOM
 }
 ]
diff --git a/security/pwned-check/pkg-deinstall b/security/pwned-check/pkg-deinstall
deleted file mode 100644
index 0d1e7d2dba0e..000000000000
--- a/security/pwned-check/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PORTNAME=${1%-*}
-
-[ "$2" = DEINSTALL ] && cat <<***EOM
-------------------------------------------------------------------------------
-
-If you are no longer using the $PORTNAME port, then manually delete
-the following directory and all its contents:
-
-	/var/db/$PORTNAME
-
-------------------------------------------------------------------------------
-***EOM
-exit 0