diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index 09100da819e5..e88a29e8645a 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	f-prot
 PORTVERSION=	6.5.1.5927
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/
 DISTNAME=	fp-FreeBSD-x86_32-ws-${PORTVERSION}
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	F-Prot Antivirus for BSD Workstations
 WWW=		https://www.f-prot.com/
 
 # Converted from RESTRICTED
 LICENSE=	f-prot-license
 LICENSE_NAME=	f-prot
 LICENSE_TEXT=	Free for personal users on personal workstations only
 LICENSE_PERMS=	auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	900.fpupdate fpscan fpupdate
 
 OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/antivir.def ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/license.key ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/product.data ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 
 	${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${STAGEDIR}${PREFIX}/etc/f-prot.conf.sample
 
 	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${STAGEDIR}${PREFIX}/bin/fpscan
 	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${STAGEDIR}${PREFIX}/bin/fpupdate
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${STAGEDIR}${PREFIX}/etc/periodic/daily
 
-	${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 	${CP} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/doc/LICENSE ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/doc/LICENSE-FPAV ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/doc/LICENSES-others ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist
index f32d1449586b..8858c18d6215 100644
--- a/security/f-prot/pkg-plist
+++ b/security/f-prot/pkg-plist
@@ -1,62 +1,62 @@
 bin/fpscan
 bin/fpupdate
-@unexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi
+@postunexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi
 @sample etc/f-prot.conf.sample
-@exec if [ ! -e /etc/f-prot.conf ]; then ln -s %D/etc/f-prot.conf /etc/f-prot.conf; fi
+@preexec if [ ! -e /etc/f-prot.conf ]; then ln -s %D/etc/f-prot.conf /etc/f-prot.conf; fi
 etc/periodic/daily/900.fpupdate
 libexec/f-prot/README
 libexec/f-prot/antivir.def
 libexec/f-prot/fpscan
 libexec/f-prot/fpupdate
 libexec/f-prot/license.key
 libexec/f-prot/product.data
-man/man1/fpscan.1.gz
-man/man5/f-prot.conf.5.gz
-man/man8/fpupdate.8.gz
+share/man/man1/fpscan.1.gz
+share/man/man5/f-prot.conf.5.gz
+share/man/man8/fpupdate.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-FPAV
 %%PORTDOCS%%%%DOCSDIR%%/LICENSES-others
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/add_info.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/appendix_a.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/appendix_b.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/appendix_c.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/auto_updt.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/chmstyle.css
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/conf_scanmail_bootup.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpmon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpmon_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpmon_options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fprots.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpscan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpscan_options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpscand.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpscand_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpscand_options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/fpupdate_options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/arrow_left.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/arrow_right.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/banner.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/dazuko.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/fpupdate.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/notusing_fprot_so_v6.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/test_eicar.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/images/using_fprot_so_v6.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/inst_pro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/loc_files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/loglevel.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/mailscanner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/main_feat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/man_updt.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/milter_scan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/per_scan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/postfix_scan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/prot_samba.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/qmail_scan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/scan_with_mailscanner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/sys_req.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/test_eicar.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/test_inst.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/todo.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/updater.html