diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile
index d26a8a07df23..a1208c324755 100644
--- a/devel/clixon/Makefile
+++ b/devel/clixon/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	clixon
-PORTVERSION=	5.6.0
+PORTVERSION=	5.8.0
 CATEGORIES=	devel
 
 MAINTAINER=	dcornejo@netgate.com
@@ -33,6 +33,9 @@ SUB_FILES=	pkg-message
 USERS=		clixon
 GROUPS=		clixon
 
+PLIST_SUB=	LIBMAJORVERSION=${PORTVERSION:R:R} \
+		LIBVERSION=${PORTVERSION:R}
+
 OPTIONS_DEFAULT=		NATIVE
 OPTIONS_SINGLE=			RESTCONF
 OPTIONS_SINGLE_RESTCONF=	NATIVE FCGI OFF
diff --git a/devel/clixon/distinfo b/devel/clixon/distinfo
index a5974f692919..ff517e2a8b36 100644
--- a/devel/clixon/distinfo
+++ b/devel/clixon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649416117
-SHA256 (clicon-clixon-5.6.0_GH0.tar.gz) = 19d1847a49ffb947b492c4e535704492aabd670cc7cc431f99aeb075c79e8f59
-SIZE (clicon-clixon-5.6.0_GH0.tar.gz) = 1410229
+TIMESTAMP = 1661785185
+SHA256 (clicon-clixon-5.8.0_GH0.tar.gz) = ad478900d89a906f2ef4db86674f3365d2a0a8e1d7246ffc0231199fc3e0d4b2
+SIZE (clicon-clixon-5.8.0_GH0.tar.gz) = 1518445
diff --git a/devel/clixon/pkg-plist b/devel/clixon/pkg-plist
index 8d9d55700c70..4b686032b338 100644
--- a/devel/clixon/pkg-plist
+++ b/devel/clixon/pkg-plist
@@ -39,6 +39,7 @@ include/clixon/clixon_regex.h
 include/clixon/clixon_sig.h
 include/clixon/clixon_stream.h
 include/clixon/clixon_string.h
+include/clixon/clixon_text_syntax.h
 include/clixon/clixon_uid.h
 include/clixon/clixon_validate.h
 include/clixon/clixon_xml.h
@@ -58,26 +59,23 @@ include/clixon/clixon_yang_module.h
 include/clixon/clixon_yang_parse_lib.h
 include/clixon/clixon_yang_type.h
 lib/libclixon.so
-lib/libclixon.so.5
-lib/libclixon.so.5.6
+lib/libclixon.so.%%LIBMAJORVERSION%%
+lib/libclixon.so.%%LIBVERSION%%
 lib/libclixon_backend.so
-lib/libclixon_backend.so.5
-lib/libclixon_backend.so.5.6
+lib/libclixon_backend.so.%%LIBMAJORVERSION%%
+lib/libclixon_backend.so.%%LIBVERSION%%
 lib/libclixon_cli.so
-lib/libclixon_cli.so.5
-lib/libclixon_cli.so.5.6
-lib/libclixon_netconf.so
-lib/libclixon_netconf.so.5
-lib/libclixon_netconf.so.5.6
+lib/libclixon_cli.so.%%LIBMAJORVERSION%%
+lib/libclixon_cli.so.%%LIBVERSION%%
 %%NO_OFF%%lib/libclixon_restconf.so
-%%NO_OFF%%lib/libclixon_restconf.so.5
-%%NO_OFF%%lib/libclixon_restconf.so.5.6
+%%NO_OFF%%lib/libclixon_restconf.so.%%LIBMAJORVERSION%%
+%%NO_OFF%%lib/libclixon_restconf.so.%%LIBVERSION%%
 sbin/clixon_backend
 %%NO_OFF%%sbin/clixon_restconf
 %%DATADIR%%/clixon-autocli@2022-02-11.yang
-%%DATADIR%%/clixon-config@2022-02-11.yang
+%%DATADIR%%/clixon-config@2022-03-21.yang
 %%DATADIR%%/clixon-lib@2021-12-05.yang
-%%DATADIR%%/clixon-restconf@2021-05-20.yang
+%%DATADIR%%/clixon-restconf@2022-03-21.yang
 %%DATADIR%%/clixon-rfc5277@2008-07-01.yang
 %%DATADIR%%/clixon-xml-changelog@2019-03-21.yang
 %%DATADIR%%/ietf-datastores@2018-02-14.yang