diff --git a/devel/cligen/Makefile b/devel/cligen/Makefile
index 883ed3c099ca..5e067be110d1 100644
--- a/devel/cligen/Makefile
+++ b/devel/cligen/Makefile
@@ -1,19 +1,22 @@
 PORTNAME=	cligen
-PORTVERSION=	5.6.0
+PORTVERSION=	5.8.0
 CATEGORIES=	devel
 
 MAINTAINER=	dcornejo@netgate.com
 COMMENT=	Command-line interface generator
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		bison:alias compiler:c11 gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clicon
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
+PLIST_SUB=	LIBMAJORVERSION=${PORTVERSION:R:R} \
+		LIBVERSION=${PORTVERSION:R}
+
 .include <bsd.port.mk>
diff --git a/devel/cligen/distinfo b/devel/cligen/distinfo
index 76ececd36432..58de7473e5a3 100644
--- a/devel/cligen/distinfo
+++ b/devel/cligen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649415244
-SHA256 (clicon-cligen-5.6.0_GH0.tar.gz) = fc8a295a47c752a557f779c177e50f681791bc9995518236326f625e14d56f06
-SIZE (clicon-cligen-5.6.0_GH0.tar.gz) = 781493
+TIMESTAMP = 1661785168
+SHA256 (clicon-cligen-5.8.0_GH0.tar.gz) = 5fab5b60eab76115867b52ee5ea7f3e21c6d71095bcd86f06a6874884600488e
+SIZE (clicon-cligen-5.8.0_GH0.tar.gz) = 793460
diff --git a/devel/cligen/pkg-plist b/devel/cligen/pkg-plist
index da85e0bad60d..13ed54e77e5c 100644
--- a/devel/cligen/pkg-plist
+++ b/devel/cligen/pkg-plist
@@ -1,21 +1,21 @@
 include/cligen/cligen.h
 include/cligen/cligen_buf.h
 include/cligen/cligen_callback.h
 include/cligen/cligen_cv.h
 include/cligen/cligen_cvec.h
 include/cligen/cligen_expand.h
 include/cligen/cligen_handle.h
 include/cligen/cligen_history.h
 include/cligen/cligen_io.h
 include/cligen/cligen_object.h
 include/cligen/cligen_parsetree.h
 include/cligen/cligen_print.h
 include/cligen/cligen_pt_head.h
 include/cligen/cligen_read.h
 include/cligen/cligen_regex.h
 include/cligen/cligen_result.h
 include/cligen/cligen_syntax.h
 include/cligen/cligen_util.h
 lib/libcligen.so
-lib/libcligen.so.5
-lib/libcligen.so.5.6
+lib/libcligen.so.%%LIBMAJORVERSION%%
+lib/libcligen.so.%%LIBVERSION%%