diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile
index f21918968d90..f9b9aef7d9a7 100644
--- a/textproc/ucto/Makefile
+++ b/textproc/ucto/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	ucto
-DISTVERSIONPREFIX=	v
 DISTVERSION=	0.29
 CATEGORIES=	textproc
+MASTER_SITES=	https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Advanced rule-based (regular-expression) and unicode-aware tokenizer
 WWW=		https://languagemachines.github.io/ucto/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	autoconf-archive>0:devel/autoconf-archive \
-		uctodata>0:textproc/uctodata
+BUILD_DEPENDS=	uctodata>0:textproc/uctodata
 LIB_DEPENDS=	libexttextcat-2.0.so:textproc/libexttextcat \
 		libfolia.so:textproc/libfolia \
 		libicuio.so:devel/icu \
 		libticcutils.so:devel/ticcutils
 RUN_DEPENDS=	uctodata>0:textproc/uctodata
 
-USES=		autoreconf compiler:c++11-lang gmake gnome libedit libtool \
-		pkgconfig readline
+USES=		compiler:c++11-lang gmake gnome libedit libtool \
+		pathfix pkgconfig readline
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	LanguageMachines
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static
 
-INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
+INSTALL_TARGET=	install-strip
+
+CONFIGURE_ARGS=	--disable-static
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-g -O3||g' \
+		${PATCH_WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/ucto/distinfo b/textproc/ucto/distinfo
index 8b19f1e82b2b..7f24c2390691 100644
--- a/textproc/ucto/distinfo
+++ b/textproc/ucto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685380228
-SHA256 (LanguageMachines-ucto-v0.29_GH0.tar.gz) = 1a125ba028f08335fb22c3314431d7407168fda808d2f3957fead8eba5295683
-SIZE (LanguageMachines-ucto-v0.29_GH0.tar.gz) = 412857
+TIMESTAMP = 1687518755
+SHA256 (ucto-0.29.tar.gz) = 82f07c72d4494dde9094964acb0bdd94d1f765834d405e3c4861a74c66c02ff0
+SIZE (ucto-0.29.tar.gz) = 501604