diff --git a/mail/spamoracle/Makefile b/mail/spamoracle/Makefile
index e5d656fba42a..d4ec76bccca5 100644
--- a/mail/spamoracle/Makefile
+++ b/mail/spamoracle/Makefile
@@ -20,7 +20,10 @@ USE_REINPLACE=	yes
 MAN1=	spamoracle.1
 MAN5=	spamoracle.conf.5
 
-DOC_FILES=	Changes README
+PLIST_FILES=	bin/spamoracle	
+.ifndef(NOPORTDOCS)
+PORTDOCS=	Changes README
+.endif
 
 do-configure:
 	@${REINPLACE_CMD} -E -e 's|^(CPP=)gcc[[:space:]]+-E|\1${CPP}|' \
@@ -31,7 +34,7 @@ do-configure:
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
+.for file in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/spamoracle/pkg-plist b/mail/spamoracle/pkg-plist
deleted file mode 100644
index 7505e4e04dbe..000000000000
--- a/mail/spamoracle/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/spamoracle
-%%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%