diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index aa9643878bc5..8365b8c5cd1b 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -1,67 +1,69 @@
 PORTNAME=	racoon2
 PORTVERSION=	${RACOON2_COMMIT_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 HASH=		7ee335e
 RACOON2_COMMIT_DATE=202000908
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 WWW=		https://github.com/zoulasc/racoon2
 
 CONFLICTS=	racoon2-legacy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zoulasc
 GH_TAGNAME=	${HASH}
 
 USES=		autoreconf libtool:build perl5 tar:tgz ssl
 CONFIGURE_ARGS+=	--enable-natt \
 			--prefix=${STAGEDIR}/${PREFIX}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl \
 		STAGEDIR=${STAGEDIR} PREFIX=${PREFIX}
 
+GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
+
 MAKE_ENV=	STAGEDIR=${STAGEDIR} PREFIX=${PREFIX}
 
 CFLAGS=		-DHAVE_CONFIG_H
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS+=	INSTALL USAGE config-usage.ja.txt config-usage.txt
 PORTDOCS+=	iked-memo.ja.txt libracoon.ja.txt specification.ja.txt
 PORTDOCS+=	spmif.txt style.txt system-message.ja.txt
 .endif
 
 post-patch:
 	# @${REINPLACE_CMD} 's|/var/run/racoon2|$$(STAGEDIR)&|' \
 		${WRKSRC}/samples/Makefile.in
 	${REINPLACE_CMD} 's|$$(sysconfdir)|${STAGEDIR}/${PREFIX}/etc|' ${WRKSRC}/samples/rc.d/Makefile.am
 	@${LN} -sf ${LOCALBASE}/share/automake-1.16/ylwrap ${WRKSRC}/lib
 
 post-patch-DOCS-on:
 .for FILE in ${PORTDOCS}
 	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
 .endfor
 
 post-install:
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \
 	    ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \
 	    ${ECHO_MSG} "         You must build the kernel if you want to run racoon on the host"; \
 	fi ;
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist
index 27fcc0c48aa1..194b588cca09 100644
--- a/security/racoon2/pkg-plist
+++ b/security/racoon2/pkg-plist
@@ -1,54 +1,54 @@
 sbin/iked
 sbin/spmd
 sbin/spmdctl
 sbin/pskgen
 etc/racoon2/default.conf.sample
 etc/racoon2/local-test.conf.sample
 etc/racoon2/racoon2.conf.sample
 etc/racoon2/transport_ike.conf.sample
 etc/racoon2/tunnel_ike.conf.sample
 etc/racoon2/tunnel_ike_natt.conf.sample
 etc/racoon2/vals.conf.sample
 etc/racoon2/hook/functions
 etc/racoon2/hook/ikesa-up.d/00ikesaup_sample
 etc/racoon2/hook/ikesa-up
 etc/racoon2/hook/ikesa-down
 etc/racoon2/hook/ikesa-rekey
 etc/racoon2/hook/child-up.d/00childup_sample
 etc/racoon2/hook/child-up.d/01setkey
 etc/racoon2/hook/child-up.d/02ifconfig-gif
 etc/racoon2/hook/child-up.d/03arp
 etc/racoon2/hook/child-up
 etc/racoon2/hook/child-down.d/01setkey
 etc/racoon2/hook/child-down.d/02ifconfig-gif
 etc/racoon2/hook/child-down.d/03arp
 etc/racoon2/hook/child-down
 etc/racoon2/hook/child-rekey
 etc/racoon2/hook/migration
 etc/rc.d/iked
 etc/rc.d/racoon2
 etc/rc.d/spmd
 lib/libracoon.a
 lib/libracoon.so
 lib/libracoon.so.0
 lib/libracoon.so.0.0.0
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp
 %%PORTDOCS%%%%DOCSDIR%%/README
-man/man8/spmd.8.gz
-man/man8/spmdctl.8.gz
-man/man8/pskgen.8.gz
-man/man8/iked.8.gz
+share/man/man8/spmd.8.gz
+share/man/man8/spmdctl.8.gz
+share/man/man8/pskgen.8.gz
+share/man/man8/iked.8.gz
 @dir etc/racoon2/psk
 @dir etc/racoon2/hook/migration.d
 @dir etc/racoon2/hook/ikesa-rekey.d
 @dir etc/racoon2/hook/ikesa-down.d
 @dir etc/racoon2/hook/child-rekey.d
 @dir etc/racoon2/hook/child-down.d
 @dir etc/racoon2/hook/child-up.d
 @dir etc/racoon2/cert
 @dir etc/racoon2
 @postexec [ ! -e %D/%%ETCDIR%%/spmd.pwd ] || mv %D/%%ETCDIR%%/spmd.pwd %D/%%ETCDIR%%/spmd.pwd.bak
 @postexec %D/sbin/pskgen -r -o %D/%%ETCDIR%%/spmd.pwd
 @rmtry %%ETCDIR%%/spmd.pwd
 @dir(root,wheel,700) /var/run/racoon2