diff --git a/devel/woboq_codebrowser/Makefile b/devel/woboq_codebrowser/Makefile
index 06989f373ed0..41a6b10c7552 100644
--- a/devel/woboq_codebrowser/Makefile
+++ b/devel/woboq_codebrowser/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.17 2023/04/19 08:09:48 adam Exp $
+# $NetBSD: Makefile,v 1.18 2023/05/21 22:40:33 nikita Exp $
 
-DISTNAME=	codebrowser-2.1.20221107
+DISTNAME=	codebrowser-2.1.20230517
 PKGNAME=	woboq_${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KDAB/}
-GITHUB_TAG=	e7bce1618726657d0615f0976f0db11a4f70f1f7
+GITHUB_TAG=	caf31972d6a866f3c16cbde1960862bf9c0e16c1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://code.woboq.org/
+HOMEPAGE=	https://codebrowser.dev/
 COMMENT=	Code analysis tool
 LICENSE=	cc-by-nc-sa-v3.0-license
 
 USE_CMAKE=	yes
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++17
+GCC_REQD+=	7
 CMAKE_ARGS+=	-DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+# CMAKE_ARGS+=	-DCLANG_BUILTIN_HEADERS_DIR=${BUILDLINK_PREFIX.clang}/lib/clang/16/include
 WRKSRC=		${WRKDIR}/codebrowser-${GITHUB_TAG}
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--as-needed
diff --git a/devel/woboq_codebrowser/distinfo b/devel/woboq_codebrowser/distinfo
index 0a876ddbe821..265e7d1f9ff0 100644
--- a/devel/woboq_codebrowser/distinfo
+++ b/devel/woboq_codebrowser/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2022/12/07 15:38:48 wiz Exp $
+$NetBSD: distinfo,v 1.8 2023/05/21 22:40:33 nikita Exp $
 
-BLAKE2s (codebrowser-2.1.20221107-e7bce1618726657d0615f0976f0db11a4f70f1f7.tar.gz) = 1ea95ad10af832093bc23d16fa504493d8f93d6cf44e04b78c40142980d358b9
-SHA512 (codebrowser-2.1.20221107-e7bce1618726657d0615f0976f0db11a4f70f1f7.tar.gz) = 9ac9583678ece1f30e37cfd23e41c1fd214878ae212aece831e3fdb533ddf5c2ddf94c694610d89575b8df558ab61b71a3faf56df30aa5853b09d1a89d4708b2
-Size (codebrowser-2.1.20221107-e7bce1618726657d0615f0976f0db11a4f70f1f7.tar.gz) = 207062 bytes
+BLAKE2s (codebrowser-2.1.20230517-caf31972d6a866f3c16cbde1960862bf9c0e16c1.tar.gz) = 342c4e83551c81000083615e4ffe14969d573597b8f3364b57dea3ac05b1b350
+SHA512 (codebrowser-2.1.20230517-caf31972d6a866f3c16cbde1960862bf9c0e16c1.tar.gz) = b01a3dc69ca29cbcec1815d8147a00fabdf4dfe6ab6e175ab77fc8de3dc4efeee96c8344f01d9f541f9271afa869d06d94ef8409bc8ab0295423a1e94126bf8b
+Size (codebrowser-2.1.20230517-caf31972d6a866f3c16cbde1960862bf9c0e16c1.tar.gz) = 207965 bytes