diff --git a/net/libyang/Makefile b/net/libyang/Makefile
index 9f6bb8ec7e0e..d963ad857d49 100644
--- a/net/libyang/Makefile
+++ b/net/libyang/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libyang
-PORTVERSION=	1.0.184
 DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.97
 CATEGORIES=	net
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT=	YANG data modeling language library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+TEST_DEPENDS=	cmocka>0:sysutils/cmocka
 
 USES=	cmake compiler:c++11-lang pkgconfig
 USE_LDCONFIG=	yes
@@ -17,6 +18,10 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	CESNET
 
-CMAKE_ARGS+=	-DENABLE_LYD_PRIV=ON
+TEST_TARGET=	test
+
+OPTIONS_DEFINE=	TEST
+
+TEST_CMAKE_BOOL=	ENABLE_TESTS
 
 .include <bsd.port.mk>
diff --git a/net/libyang/distinfo b/net/libyang/distinfo
index dceb6fc670ff..ce40bd3c74fd 100644
--- a/net/libyang/distinfo
+++ b/net/libyang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595492965
-SHA256 (CESNET-libyang-v1.0.184_GH0.tar.gz) = 1a5637451b73c4c5683837eb4c51371bb084795f653bc1a5fc20fed5541b58bc
-SIZE (CESNET-libyang-v1.0.184_GH0.tar.gz) = 1659420
+TIMESTAMP = 1634102955
+SHA256 (CESNET-libyang-v2.0.97_GH0.tar.gz) = 91f5db0bc3799170d1e480abfc08a7fe7e50ce07a5433b5e32e93418314d48f9
+SIZE (CESNET-libyang-v2.0.97_GH0.tar.gz) = 1066042
diff --git a/net/libyang/pkg-plist b/net/libyang/pkg-plist
index d308491c32ae..6e358817c128 100644
--- a/net/libyang/pkg-plist
+++ b/net/libyang/pkg-plist
@@ -1,20 +1,30 @@
 bin/yanglint
 bin/yangre
+include/libyang/config.h
+include/libyang/context.h
 include/libyang/dict.h
-include/libyang/extensions.h
+include/libyang/in.h
 include/libyang/libyang.h
+include/libyang/log.h
+include/libyang/out.h
+include/libyang/parser_data.h
+include/libyang/parser_schema.h
+include/libyang/plugins.h
+include/libyang/plugins_exts.h
+include/libyang/plugins_exts_compile.h
+include/libyang/plugins_exts_print.h
+include/libyang/plugins_types.h
+include/libyang/printer_data.h
+include/libyang/printer_schema.h
+include/libyang/set.h
+include/libyang/tree.h
 include/libyang/tree_data.h
+include/libyang/tree_edit.h
 include/libyang/tree_schema.h
-include/libyang/user_types.h
-include/libyang/xml.h
+include/libyang/version.h
 lib/libyang.so
-lib/libyang.so.1
-lib/libyang.so.1.9.2
-lib/libyang1/extensions/metadata.so
-lib/libyang1/extensions/nacm.so
-lib/libyang1/extensions/yangdata.so
-lib/libyang1/user_types/user_inet_types.so
-lib/libyang1/user_types/user_yang_types.so
+lib/libyang.so.2
+lib/libyang.so.2.8.25
 libdata/pkgconfig/libyang.pc
 man/man1/yanglint.1.gz
 man/man1/yangre.1.gz