diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index b38c5daaeb89..10280f43625f 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,26 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	conserver
-PORTVERSION=	8.2.1
-PORTREVISION=	1
+DISTVERSIONPREFIX=      v
+DISTVERSION=	8.2.2
 CATEGORIES=	comms
-MASTER_SITES=	http://www.conserver.com/ \
-		ftp://ftp.conserver.com/conserver/
 PKGNAMESUFFIX=	-com
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD3CLAUSE
 
-CONFLICTS_INSTALL=	conserver-[0-9]*
+USES=		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
 
-USES=		ssl
-USE_RC_SUBR=	conserver
+CONFLICTS_INSTALL=	conserver-[0-9]*
 
 OPTIONS_DEFINE=	FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS
 FREEIPMI_DESC=	Compile in FreeIPMI support
@@ -30,9 +29,6 @@ STRIPREALM_DESC=Strip @REALM when using GSSAPI
 STRIPREALM_IMPLIES=	GSSAPI
 UDS_DESC=	Use Unix domain sockets for client/server
 
-DEFAULTPORT?=	782
-DEFAULTHOST?=	localhost
-
 FREEIPMI_CONFIGURE_ON=	--with-freeipmi=${LOCALBASE}
 FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 GSSAPI_CONFIGURE_WITH=	gssapi
@@ -46,4 +42,7 @@ post-patch:
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
 
+DEFAULTPORT?=	782
+DEFAULTHOST?=	localhost
+
 .include <bsd.port.mk>
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index 692245c963fc..816065d75df7 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1,2 +1,3 @@
-SHA256 (conserver-8.2.1.tar.gz) = 251ae01997e8f3ee75106a5b84ec6f2a8eb5ff2f8092438eba34384a615153d0
-SIZE (conserver-8.2.1.tar.gz) = 335241
+TIMESTAMP = 1539294082
+SHA256 (conserver-conserver-v8.2.2_GH0.tar.gz) = c5cc773634f0a4730f6d8d749ea1b9174f21bdefecac9dc1ae987e8de03f704f
+SIZE (conserver-conserver-v8.2.2_GH0.tar.gz) = 328834