diff --git a/Makefile b/Makefile
index 2f1ebde..c1e0f27 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_RC_SUBR=	${PORTNAME}
-SUB_FILES=	pkg-message pkg-plist
-SUB_LIST+=	PORTNAME=${PORTNAME} COMMENT="${COMMENT}"
+SUB_FILES=      pkg-message
+PLIST_SUB=      PORTNAME=${PORTNAME}
+SUB_LIST+=      PORTNAME=${PORTNAME} COMMENT="${COMMENT}"
 
 post-patch:
 .for f in Makefile ${PORTNAME}.8 ${PORTNAME}tab.5
diff --git a/files/pkg-plist.in b/files/pkg-plist.in
deleted file mode 100644
index 02fc584..0000000
--- a/files/pkg-plist.in
+++ /dev/null
@@ -1,5 +0,0 @@
-sbin/%%PORTNAME%%
-@sample etc/%%PORTNAME%%tab.sample
-@postunexec rmdir /var/spool/%%PORTNAME%% 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/spool/%%PORTNAME%%'."
-man/man8/%%PORTNAME%%.8.gz
-man/man5/%%PORTNAME%%tab.5.gz
diff --git a/pkg-plist b/pkg-plist
index 7b449b2..d289dfd 100644
--- a/pkg-plist
+++ b/pkg-plist
@@ -1,5 +1,6 @@
-sbin/anacron
-@sample etc/anacrontab.sample
-@unexec rmdir /var/spool/anacron 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/spool/anacron'."
-man/man8/anacron.8.gz
-man/man5/anacrontab.5.gz
+sbin/%%PORTNAME%%
+@sample etc/%%PORTNAME%%tab.sample
+@postexec mkdir -p /var/spool/%%PORTNAME%% 2>/dev/null
+@postunexec rmdir /var/spool/%%PORTNAME%% 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/spool/%%PORTNAME%%'."
+man/man8/%%PORTNAME%%.8.gz
+man/man5/%%PORTNAME%%tab.5.gz