diff --git a/net-mgmt/check_ssl_cert/Makefile b/net-mgmt/check_ssl_cert/Makefile
index 520f0a775dad..32fce751bb9b 100644
--- a/net-mgmt/check_ssl_cert/Makefile
+++ b/net-mgmt/check_ssl_cert/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	check_ssl_cert
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.35.0
+DISTVERSION=	2.36.0
 CATEGORIES=	net-mgmt
+MASTER_SITES=	https://github.com/matteocorti/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	cmt@FreeBSD.org
-
 COMMENT=	Nagios/Icinga plugin for checking SSL/TLS certificates
+
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING.md
 
 RUN_DEPENDS=	expect:lang/expect \
 		curl:ftp/curl \
 		p5-TimeDate>=0:devel/p5-TimeDate
 
+USES=		tar:bz2
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	matteocorti
-
 PLIST_FILES=	libexec/nagios/check_ssl_cert \
 		${MANPREFIX}/man/man1/check_ssl_cert.1.gz
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_SCRIPT} ${WRKSRC}/check_ssl_cert ${STAGEDIR}${PREFIX}/libexec/nagios/
 	${INSTALL_MAN} ${WRKSRC}/check_ssl_cert.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/check_ssl_cert/distinfo b/net-mgmt/check_ssl_cert/distinfo
index 5f9eb915905a..9027dc705f7b 100644
--- a/net-mgmt/check_ssl_cert/distinfo
+++ b/net-mgmt/check_ssl_cert/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1657913272
-SHA256 (matteocorti-check_ssl_cert-v2.35.0_GH0.tar.gz) = 655ba07e81e2d730bbf31a6a2e2ef7b3febed39de2ccbce6b26f879c6a7ca2f9
-SIZE (matteocorti-check_ssl_cert-v2.35.0_GH0.tar.gz) = 316655
+TIMESTAMP = 1658954131
+SHA256 (check_ssl_cert-2.36.0.tar.bz2) = 4e173a4e826c01783500a8aa3fd79af1aca1cb9f4d33724dff915ac8ba1a730d
+SIZE (check_ssl_cert-2.36.0.tar.bz2) = 72899