diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile
index 4372a70a2115..24f9f51a698e 100644
--- a/devel/include-what-you-use/Makefile
+++ b/devel/include-what-you-use/Makefile
@@ -1,26 +1,23 @@
 PORTNAME=	include-what-you-use
-PORTVERSION=	0.18
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for use with clang to analyze \#includes in C and C++ source files
 WWW=		https://include-what-you-use.org
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LLVM_VER=	14
-BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-RUN_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-
-USES=		cmake compiler:c++11-lang ncurses python:3.8,run shebangfix
+USES=		cmake llvm:${LLVM_VER},build,run ncurses python:3.8,run shebangfix
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	fix_includes.py \
 		iwyu_tool.py
 
 CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm \
 		-DClang_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang
 
+LLVM_VER=	16
+
 .include <bsd.port.mk>
diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo
index 0c90d7a4fdee..fa5cd3f8c22a 100644
--- a/devel/include-what-you-use/distinfo
+++ b/devel/include-what-you-use/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650583553
-SHA256 (include-what-you-use-include-what-you-use-0.18_GH0.tar.gz) = 497b8d01e7faf561a20b09fdff38b66ba50febe4b4b7cf3cf2e809ee3be55a99
-SIZE (include-what-you-use-include-what-you-use-0.18_GH0.tar.gz) = 750341
+TIMESTAMP = 1682109713
+SHA256 (include-what-you-use-include-what-you-use-0.20_GH0.tar.gz) = 4fe4bd5581ee60bb2bcf1bf40f087a8c5b090d943d0376233638f30f29af0e2e
+SIZE (include-what-you-use-include-what-you-use-0.20_GH0.tar.gz) = 766208