diff --git a/security/libreswan/Makefile b/security/libreswan/Makefile
index 94a277e6317b..4fec1be70884 100644
--- a/security/libreswan/Makefile
+++ b/security/libreswan/Makefile
@@ -1,47 +1,51 @@
 PORTNAME=	libreswan
 DISTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://download.libreswan.org/
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	e43bc147e1342df55f51df06ef886749111d2cff.patch:-p1 # fix for https://github.com/libreswan/libreswan/issues/448
 PATCHFILES+=	607237df81c9896743f9b2cb91faab01e4d1c3fc.patch:-p1 # BSD patches: https://github.com/libreswan/libreswan/commit/607237df81c9896743f9b2cb91faab01e4d1c3fc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	IPsec and IKE based firewall
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xmlto:textproc/xmlto # build requires xmlto, but manpages aren't installed: https://github.com/libreswan/libreswan/issues/479
+BUILD_DEPENDS=	gawk:lang/gawk \
+		xmlto:textproc/xmlto # build requires xmlto, but manpages aren't installed: https://github.com/libreswan/libreswan/issues/479
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libldns.so:dns/ldns \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libunbound.so:dns/unbound
 
 USES=		bison gmake pkgconfig python
 
 CFLAGS+=	-I${WRKSRC}/include/unbound
 
 MAKE_ARGS=	PKG_BASE=${LOCALBASE} \
 		NSS_CFLAGS="`pkg-config --cflags nss`" NSS_LDFLAGS="`pkg-config --libs nss`" \
 		NSPR_LDFLAGS="`pkg-config --libs nspr`" \
 		CRYPT_LDFLAGS=-lcrypt \
 		USE_PTHREAD_SETSCHEDPRIO=false \
 		WERROR_CFLAGS=""  \
 		PYTHON_BINARY=${PYTHON_CMD}
 
+BINARY_ALIAS=	awk=gawk
+
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@cd ${WRKSRC}/mk/defaults && \
 		${RLN} netbsd.mk freebsd.mk
 
 post-install:
 .for f in _import_crl addconn algparse cavp dncheck ecdsasigkey enumcheck hunkcheck ipcheck jambufcheck keyidcheck pluto readwriteconf rsasigkey showhostkey timecheck whack
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/ipsec/${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/libreswan/pkg-plist b/security/libreswan/pkg-plist
index 3ecc6e1c6f11..ec8655fa8b5f 100644
--- a/security/libreswan/pkg-plist
+++ b/security/libreswan/pkg-plist
@@ -1,45 +1,75 @@
 /etc/pam.d/pluto
 etc/ipsec.conf
 etc/ipsec.d/policies/block
 etc/ipsec.d/policies/clear
 etc/ipsec.d/policies/clear-or-private
 etc/ipsec.d/policies/portexcludes.conf
 etc/ipsec.d/policies/private
 etc/ipsec.d/policies/private-or-clear
 etc/ipsec.secrets
 etc/logrotate.d/libreswan
 libexec/ipsec/_import_crl
 libexec/ipsec/_plutorun
 libexec/ipsec/_realsetup
 libexec/ipsec/_secretcensor
 libexec/ipsec/_stackmanager
 libexec/ipsec/_unbound-hook
 libexec/ipsec/_updown
 libexec/ipsec/_updown.bsdkame
 libexec/ipsec/addconn
 libexec/ipsec/algparse
 libexec/ipsec/auto
 libexec/ipsec/barf
 libexec/ipsec/cavp
 libexec/ipsec/dncheck
 libexec/ipsec/ecdsasigkey
 libexec/ipsec/enumcheck
 libexec/ipsec/hunkcheck
 libexec/ipsec/ipcheck
 libexec/ipsec/jambufcheck
 libexec/ipsec/keyidcheck
 libexec/ipsec/letsencrypt
 libexec/ipsec/look
 libexec/ipsec/newhostkey
 libexec/ipsec/pluto
 libexec/ipsec/readwriteconf
 libexec/ipsec/rsasigkey
 libexec/ipsec/setup
 libexec/ipsec/show
 libexec/ipsec/showhostkey
 libexec/ipsec/timecheck
 libexec/ipsec/verify
 libexec/ipsec/whack
 sbin/ipsec
 %%PORTDOCS%%%%DOCSDIR%%/ipsec.conf-sample
 %%PORTDOCS%%%%DOCSDIR%%/ipsec.secrets-sample
+share/man/man5/ipsec.conf.5.gz
+share/man/man5/ipsec.secrets.5.gz
+share/man/man8/ipsec.8.gz
+share/man/man8/ipsec__import_crl.8.gz
+share/man/man8/ipsec__plutorun.8.gz
+share/man/man8/ipsec__realsetup.8.gz
+share/man/man8/ipsec__secretcensor.8.gz
+share/man/man8/ipsec__stackmanager.8.gz
+share/man/man8/ipsec__unbound-hook.8.gz
+share/man/man8/ipsec__updown.8.gz
+share/man/man8/ipsec__updown.bsdkame.8.gz
+share/man/man8/ipsec_addconn.8.gz
+share/man/man8/ipsec_auto.8.gz
+share/man/man8/ipsec_barf.8.gz
+share/man/man8/ipsec_checknss.8.gz
+share/man/man8/ipsec_ecdsasigkey.8.gz
+share/man/man8/ipsec_import.8.gz
+share/man/man8/ipsec_initnss.8.gz
+share/man/man8/ipsec_letsencrypt.8.gz
+share/man/man8/ipsec_look.8.gz
+share/man/man8/ipsec_newhostkey.8.gz
+share/man/man8/ipsec_pluto.8.gz
+share/man/man8/ipsec_readwriteconf.8.gz
+share/man/man8/ipsec_rsasigkey.8.gz
+share/man/man8/ipsec_setup.8.gz
+share/man/man8/ipsec_show.8.gz
+share/man/man8/ipsec_showhostkey.8.gz
+share/man/man8/ipsec_verify.8.gz
+share/man/man8/ipsec_whack.8.gz
+share/man/man8/pluto.8.gz