diff --git a/textproc/cg3/Makefile b/textproc/cg3/Makefile
index a01741a5cf9d..9c15afb8b69f 100644
--- a/textproc/cg3/Makefile
+++ b/textproc/cg3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cg3
-PORTVERSION=	1.3.6
-DISTVERSIONPREFIX=	v
+DISTVERSION=	1.3.6
 CATEGORIES=	textproc
+MASTER_SITES=	https://github.com/GrammarSoft/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tools for the Constraint Grammar formalism
@@ -12,13 +12,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libicuuc.so:devel/icu
 
-USES=		cmake
-USE_GITHUB=	yes
-GH_ACCOUNT=	GrammarSoft
+USES=		cmake pathfix tar:bz2
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+
 post-patch:
 	@${REINPLACE_CMD} -e '/D_POSIX_C_SOURCE/d' \
 		${WRKSRC}/CMakeLists.txt
 
+post-patch-OPTIMIZED_CFLAGS-off:
+	@${REINPLACE_CMD} -e 's| -O3||g' \
+		${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/textproc/cg3/distinfo b/textproc/cg3/distinfo
index 5b68d4320693..bbf709cb98b6 100644
--- a/textproc/cg3/distinfo
+++ b/textproc/cg3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648840020
-SHA256 (GrammarSoft-cg3-v1.3.6_GH0.tar.gz) = 6ad782fea6204d5899186fc6ad41ef36de94304b4221c388d64abb927f48bc5b
-SIZE (GrammarSoft-cg3-v1.3.6_GH0.tar.gz) = 365386
+TIMESTAMP = 1649019377
+SHA256 (cg3-1.3.6.tar.bz2) = ee43b20b251b100eca986655795e26b53636d889947654f4e4840b270cb9d6e9
+SIZE (cg3-1.3.6.tar.bz2) = 290961