diff --git a/security/pks/Makefile b/security/pks/Makefile
index 37d5a568f46a..ee844db05803 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	pks
 PORTVERSION=	0.9.6.20040312
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security www
 MASTER_SITES=	http://pks.sourceforge.net/ LOCAL/mandree
 DISTFILES=	pks-current.tgz
 
 MAINTAINER=	tphilipp@potion-studios.com
 COMMENT=	PGP Public Key Server
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	openssl
 BROKEN_SSL_REASON_openssl=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
 
 USES=		bdb ssl
 USE_GCC=	yes
 USE_RC_SUBR=	pksd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--localstatedir=/var/pks \
 		--with-libwrap \
 		--with-openssl=${OPENSSLBASE}
 MAKE_ENV+=	SUBDIRS=
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" \
 		DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
 
 SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME="${PORTNAME}"
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	pks_help.* README EMAIL
 
 post-extract:
 	@${CP} -a ${FILESDIR}/EMAIL ${WRKSRC}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgpsplit
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pksdctl
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pksclient
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/pksd
 	${MV} ${STAGEDIR}${PREFIX}/etc/pksd.conf ${STAGEDIR}${PREFIX}/etc/pksd.conf.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base
 BROKEN=	Does not build with OpenSSL 1.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/pks/files/pkg-deinstall.in b/security/pks/files/pkg-deinstall.in
deleted file mode 100644
index 9d424a24855e..000000000000
--- a/security/pks/files/pkg-deinstall.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-POST-DEINSTALL)
-	cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following directories and files:
-
-        %%PREFIX%%/etc/pksd.conf
-	/var/pks
-===========================================================================
-EOF
-	;;
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/security/pks/files/pkg-message.in b/security/pks/files/pkg-message.in
index feb4dbff8c2d..68e9f9701430 100644
--- a/security/pks/files/pkg-message.in
+++ b/security/pks/files/pkg-message.in
@@ -1,41 +1,52 @@
 [
 { type: install
   message: <<EOM
 Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable this service:
 
  pksd_enable (bool):           Set to NO by default.
                                Set it to YES to enable pksd.
 
  pksd_config (path):           Set to %%PREFIX%%/etc/pksd.conf
                                by default.
 
  pksd_mailq_enable (bool):     Set to NO by default. Process incoming
                                mail queue of commands and key requests
                                (you will need to configure your mail
                                infrastructure to enable this. See:
                                %%PREFIX%%/share/doc/pks/README and
                                %%PREFIX%%/share/doc/pks/EMAIL for details.
 
  pksd_queue_delay (int):       Periodically process incoming mail.
                                Set to 60 seconds by default.
 
 
 
           To enable adding keys via the web interface
           please create a configuration file at:
 
             %%PREFIX%%/etc/pksd.conf
 
           Check sample file at:
 
             %%PREFIX%%/etc/pksd.conf.sample
 
 
           Also note that the database used by pks
           sometimes needs to be created manually, to
           do that refer to:
 
             man 8 pksclient
 EOM
+},
+{ type: remove
+  message: <<EOM
+===========================================================================
+If you won't be using %%PORTNAME%% any longer, you may want to remove the
+following directories and files:
+
+        %%PREFIX%%/etc/pksd.conf
+	/var/pks
+===========================================================================
+EOM
 }
 ]