diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index d0c879902dd6..ba84072408b4 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,30 +1,30 @@
 # Created by: Mij <mij@bitchx.it>
 
 PORTNAME=	sshguard
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Protect hosts from brute-force attacks against SSH and other services
 
 LICENSE=	BSD2CLAUSE
 
 USE_RC_SUBR=	sshguard
 
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|' \
 		${WRKSRC}/doc/sshguard.8.rst
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/examples/sshguard.conf.sample
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/examples/sshguard.conf.sample \
 		${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo
index 7ae5f27eac21..df01aba97817 100644
--- a/security/sshguard/distinfo
+++ b/security/sshguard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596260072
-SHA256 (sshguard-2.4.1.tar.gz) = 875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
-SIZE (sshguard-2.4.1.tar.gz) = 723940
+TIMESTAMP = 1622991099
+SHA256 (sshguard-2.4.2.tar.gz) = 2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8
+SIZE (sshguard-2.4.2.tar.gz) = 835431
diff --git a/security/sshguard/files/patch-src_sshguard.in b/security/sshguard/files/patch-src_sshguard.in
index 6881e162028f..0a73967144a5 100644
--- a/security/sshguard/files/patch-src_sshguard.in
+++ b/security/sshguard/files/patch-src_sshguard.in
@@ -1,19 +1,19 @@
---- src/sshguard.in.orig	2019-05-23 22:25:17 UTC
+--- src/sshguard.in.orig	2021-06-06 14:54:07 UTC
 +++ src/sshguard.in
-@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
+@@ -98,14 +98,8 @@ elif [ -z "$tailcmd" ]; then
      exit 1
  fi
  
--if [ ! -z "$PID_FILE" ]; then
+-if [ -n "$PID_FILE" ]; then
 -    if [ ! -e "$PID_FILE" ]; then
 -        echo "$$" > $PID_FILE
 -    else
 -        err "$PID_FILE already exists; is SSHGuard already running?"
 -        exit 1
 -    fi
 -fi
 +# Already checked by rc(8)
 +echo "$$" > $PID_FILE
  
- # Make sure to kill entire process group (subshell) on exit/interrupts.
- trap "clean_and_exit" INT TERM
+ # Select PARSER from configuration file or use default. Add POST_PARSER from
+ # configuration file if it exists.