diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index d5837c463597..e4a28b189e82 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sshguard
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
diff --git a/security/sshguard/files/patch-src_sshguard.in b/security/sshguard/files/patch-src_sshguard.in
new file mode 100644
index 000000000000..6881e162028f
--- /dev/null
+++ b/security/sshguard/files/patch-src_sshguard.in
@@ -0,0 +1,19 @@
+--- src/sshguard.in.orig	2019-05-23 22:25:17 UTC
++++ src/sshguard.in
+@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
+     exit 1
+ fi
+ 
+-if [ ! -z "$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