diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index c6cb66b2ca10..d3cffb881a1f 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	soju
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	https://git.sr.ht/~emersion/go-scfg/archive/:goscfg \
 		https://git.sr.ht/~sircmpwn/go-bare/archive/:gobare
 DISTFILES=	${GO_SCFG_REV}.tar.gz:goscfg \
 		${GO_BARE_REV}.tar.gz:gobare
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	IRC bouncer
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 OPTIONS_DEFAULT=	DOCS
 OPTIONS_DEFINE=		DOCS
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emersion
 GH_TUPLE=	emersion:go-sasl:7bfe0ed36a21:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
 		go-irc:irc:v3.1.4:go_irc_irc/vendor/gopkg.in/irc.v3 \
 		golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
 		golang:sys:751e447fb3d0:golang_sys/vendor/golang.org/x/sys \
 		golang:term:6886f2dfbf5b:golang_term/vendor/golang.org/x/term \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
 		klauspost:compress:v1.13.5:klauspost_compress/vendor/github.com/klauspost/compress \
 		mattn:go-sqlite3:v1.14.8:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
 		nhooyr:websocket:v1.8.7:nhooyr_websocket/vendor/nhooyr.io/websocket \
 		pires:go-proxyproto:v0.6.1:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto
 
 GO_BARE_REV=	ab86bc2846d9
 GO_SCFG_REV=	142a8aa629fc
 GO_PKGNAME=	./cmd/soju ./cmd/sojuctl ./contrib/znc-import.go
 PLIST_FILES=	bin/soju \
 		bin/sojuctl \
 		bin/soju-znc-import \
 		${DOCSDIR_REL}/getting-started.md
 
 DOCS_BUILD_DEPENDS=	scdoc:textproc/scdoc
 DOCS_PLIST_FILES=	man/man1/soju.1.gz \
 
 post-extract:
 	${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~emersion ${WRKSRC}/vendor/git.sr.ht/~sircmpwn
 	${MV} ${WRKDIR}/go-scfg-${GO_SCFG_REV} ${WRKSRC}/vendor/git.sr.ht/~emersion/go-scfg
 	${MV} ${WRKDIR}/go-bare-${GO_BARE_REV} ${WRKSRC}/vendor/git.sr.ht/~sircmpwn/go-bare
 
 post-build-DOCS-on:
 	${LOCALBASE}/bin/scdoc <${WRKSRC}/doc/${PORTNAME}.1.scd >${WRKSRC}/doc/${PORTNAME}.1
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/bin/znc-import.go ${STAGEDIR}${PREFIX}/bin/soju-znc-import
 	${INSTALL_MAN} ${WRKSRC}/doc/getting-started.md ${STAGEDIR}${DOCSDIR}
 
 post-install-DOCS-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/irc/soju/files/patch-cmd_soju_main.go b/irc/soju/files/patch-cmd_soju_main.go
new file mode 100644
index 000000000000..f0a2a1f03f41
--- /dev/null
+++ b/irc/soju/files/patch-cmd_soju_main.go
@@ -0,0 +1,9 @@
+--- cmd/soju/main.go.orig	2021-09-13 12:23:33 UTC
++++ cmd/soju/main.go
+@@ -253,5 +253,6 @@ func proxyProtoListener(ln net.Listener, srv *soju.Ser
+ 			}
+ 			return proxyproto.IGNORE, nil
+ 		},
++		ReadHeaderTimeout: 5 * time.Second,
+ 	}
+ }