diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index c60a2ae406bf..33fb843fa0ef 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	conserver
-DISTVERSIONPREFIX=	v
-DISTVERSION=	8.2.6
+DISTVERSION=	8.2.7
 CATEGORIES=	comms
+MASTER_SITES=	https://github.com/bstansell/conserver/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-com
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf:2.69 ssl
-USE_GITHUB=	yes
 USE_RC_SUBR=	conserver
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
-		--with-pam --with-libwrap --with-openssl
+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
+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_DESC=	Strip @REALM when using GSSAPI
 STRIPREALM_IMPLIES=	GSSAPI
-UDS_DESC=	Use Unix domain sockets for client/server
+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
+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
+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
 
-post-extract:
-.for file in config.guess config.sub
-	${CP} -f ${TEMPLATES}/${file} ${WRKSRC}
-.endfor
-
 .include <bsd.port.mk>
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index 707a1e8de740..3155055b3d55 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645811070
-SHA256 (conserver-conserver-v8.2.6_GH0.tar.gz) = 1c8b86f123d2d8e3ce568b782087b43dfac9cf6ffd5a9bdfcfdc6718d749a923
-SIZE (conserver-conserver-v8.2.6_GH0.tar.gz) = 288423
+TIMESTAMP = 1657419657
+SHA256 (conserver-8.2.7.tar.gz) = 0607f2147a4d384f1e677fbe4e6c68b66a3f015136b21bcf83ef9575985273d8
+SIZE (conserver-8.2.7.tar.gz) = 512287
diff --git a/comms/conserver-com/files/patch-Makefile.in b/comms/conserver-com/files/patch-conserver_Makefile.in
similarity index 58%
rename from comms/conserver-com/files/patch-Makefile.in
rename to comms/conserver-com/files/patch-conserver_Makefile.in
index 64b288103a20..93aecffba493 100644
--- a/comms/conserver-com/files/patch-Makefile.in
+++ b/comms/conserver-com/files/patch-conserver_Makefile.in
@@ -1,11 +1,11 @@
---- conserver/Makefile.in.orig	Fri Dec  2 07:32:43 2005
-+++ conserver/Makefile.in	Fri Dec  2 07:33:08 2005
-@@ -65,7 +65,6 @@
- 	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
+--- conserver/Makefile.in.orig	2022-07-08 01:20:02 UTC
++++ conserver/Makefile.in
+@@ -66,7 +66,6 @@ install: conserver
+ 	$(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
  	$(MKDIR) $(DESTDIR)$(exampledir)
  	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
 -	$(MKDIR) $(DESTDIR)$(pkglibdir)
 -	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
 +	$(INSTALL) convert $(DESTDIR)$(sbindir)/conserver-convert
  
  .PHONY: clean distclean install