diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index a6c3eb06b15a..546fbab97d9f 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	20100526a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 
@@ -53,12 +53,10 @@ PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj
 .endif
 .endif
 
-post-patch:
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
 .for FILE in ${PORTDOCS}
 	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
 .endfor
-.endif
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|'
@@ -68,7 +66,12 @@ post-configure:
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/racoon2
-.if ${PORT_OPTIONS:MDOCS}
+	@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}
@@ -76,10 +79,5 @@ post-install:
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@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 ;
 
 .include <bsd.port.post.mk>
diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist
index 3626303214ed..5e43770451a2 100644
--- a/security/racoon2/pkg-plist
+++ b/security/racoon2/pkg-plist
@@ -35,6 +35,15 @@ man/man8/spmdctl.8.gz
 man/man8/pskgen.8.gz
 man/man8/iked.8.gz
 %%KINK%%man/man8/kinkd.8.gz
+@dir etc/racoon2/psk
+@dir etc/racoon2/hook/ph1-up.d
+@dir etc/racoon2/hook/ph1-down.d
+@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/cert
 @exec test -f %%PFX%%/etc/racoon2/spmd.pwd && mv %%PFX%%/etc/racoon2/spmd.pwd %%PFX%%/etc/racoon2/spmd.pwd.bak && %%PFX%%/pskgen -r -o %%PFX%%/etc/racoon2/spmd.pwd
 @unexec rm -f %%PFX/etc/racoon2/spmd.pwd
 @dir(root,wheel,700) /var/run/racoon2