diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index 5c7e2c602d65..a8290a64b462 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	tig
-DISTVERSION=	2.5.5
+DISTVERSION=	2.5.8
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jonas/tig/releases/download/${DISTNAME}/
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Text-mode interface for git
 WWW=		https://jonas.github.io/tig/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	git:devel/git
 
-USES=		iconv gmake ncurses readline
+USES=		gmake iconv ncurses readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
 MAKE_ARGS=	V=1
 
 INSTALL_TARGET=	install install-doc-man
 
 # Tests fail when running as part of a non-interactive Poudriere
 # build, but using script(1) seems to be a good enough workaround and
 # allows them to run successfully anyway.
-TEST_TARGET=	test
-DO_MAKE_TEST=	/usr/bin/script -q /dev/null ${SETENV} ${TEST_ENV} ${GMAKE}
+TEST_TARGET=	test-address-sanitizer
+DO_MAKE_TEST=	script -q /dev/null ${SETENV} ${TEST_ENV} ${GMAKE}
 
 PLIST_FILES=	bin/tig \
 		'@sample etc/tigrc.sample' \
 		man/man1/tig.1.gz \
 		man/man5/tigrc.5.gz \
 		man/man7/tigmanual.7.gz
 
-OPTIONS_DEFINE=	GIT
+OPTIONS_DEFINE=	GIT PCRE
 
 GIT_DESC=	Install devel/git as runtime dependency
 
 GIT_RUN_DEPENDS=	git:devel/git
-GIT_VARS_OFF=	PKGMESSAGE="${.CURDIR}/pkg-message-git"
+GIT_VARS_OFF=		PKGMESSAGE="${.CURDIR}/pkg-message-git"
+PCRE_LIB_DEPENDS=	lpcre2-posix.so:devel/pcre2
+PCRE_CONFIGURE_WITH=	pcre
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/tigrc ${STAGEDIR}${PREFIX}/etc/tigrc.sample
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tig
 
 .include <bsd.port.mk>
diff --git a/devel/tig/distinfo b/devel/tig/distinfo
index 104aea6ed57a..4a03b083b858 100644
--- a/devel/tig/distinfo
+++ b/devel/tig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642672607
-SHA256 (tig-2.5.5.tar.gz) = 24ba2c8beae889e6002ea7ced0e29851dee57c27fde8480fb9c64d5eb8765313
-SIZE (tig-2.5.5.tar.gz) = 1175752
+TIMESTAMP = 1678964725
+SHA256 (tig-2.5.8.tar.gz) = b70e0a42aed74a4a3990ccfe35262305917175e3164330c0889bd70580406391
+SIZE (tig-2.5.8.tar.gz) = 1179844