diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 9b7a20488617..e9d9cf309626 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	conserver
 DISTVERSION=	8.2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	https://github.com/bstansell/conserver/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-com
 
-MAINTAINER=	eduardo@FreeBSD.org
+MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 WWW=		https://www.conserver.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ssl
 USE_RC_SUBR=	conserver
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwrap \
 		--with-master=${DEFAULTHOST} \
 		--with-openssl \
 		--with-pam \
 		--with-port=${DEFAULTPORT}
 
 CONFLICTS_INSTALL=	conserver
 
 OPTIONS_DEFINE=		FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS
 FREEIPMI_DESC=		Compile in FreeIPMI support
 GSSAPIONLY_DESC=	Never prompt for a password when using GSSAPI
 GSSAPIONLY_IMPLIES=	GSSAPI
 STRIPREALM_DESC=	Strip @REALM when using GSSAPI
 STRIPREALM_IMPLIES=	GSSAPI
 UDS_DESC=		Use Unix domain sockets for client/server
 
 FREEIPMI_CONFIGURE_ON=		--with-freeipmi=${LOCALBASE}
 FREEIPMI_LIB_DEPENDS=		libfreeipmi.so:sysutils/freeipmi
 GSSAPI_CONFIGURE_WITH=		gssapi
 GSSAPIONLY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-conserver__master.c
 STRIPREALM_CONFIGURE_WITH=	striprealm
 UDS_CONFIGURE_WITH=		uds
 
 post-extract:
 .for file in config.guess config.sub
 	${CP} -f ${TEMPLATES}/${file} ${WRKSRC}
 .endfor
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
 
 DEFAULTPORT?=	782
 DEFAULTHOST?=	localhost
 
 .include <bsd.port.mk>
diff --git a/comms/conserver-com/files/patch-conserver_readcfg.c b/comms/conserver-com/files/patch-conserver_readcfg.c
new file mode 100644
index 000000000000..a683927d324c
--- /dev/null
+++ b/comms/conserver-com/files/patch-conserver_readcfg.c
@@ -0,0 +1,14 @@
+--- conserver/readcfg.c.orig	2022-07-08 01:20:02 UTC
++++ conserver/readcfg.c
+@@ -3128,9 +3128,9 @@ ConsoleAdd(CONSENT *c)
+ 
+ 	SwapStr(&pCEmatch->motd, &c->motd);
+ 	SwapStr(&pCEmatch->idlestring, &c->idlestring);
+-	SwapStr(&pCEmatch->replstring, &c->breaklist);
++	SwapStr(&pCEmatch->replstring, &c->replstring);
+ 	SwapStr(&pCEmatch->tasklist, &c->tasklist);
+-	SwapStr(&pCEmatch->breaklist, &c->tasklist);
++	SwapStr(&pCEmatch->breaklist, &c->breaklist);
+ 	pCEmatch->portinc = c->portinc;
+ 	pCEmatch->portbase = c->portbase;
+ 	pCEmatch->spinmax = c->spinmax;