diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile
index 24f9f51a698e..b9c5d1428a8e 100644
--- a/devel/include-what-you-use/Makefile
+++ b/devel/include-what-you-use/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	include-what-you-use
-PORTVERSION=	0.20
+PORTVERSION=	0.21
 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
 
 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
+LLVM_VER=	17
 
 .include <bsd.port.mk>
diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo
index fa5cd3f8c22a..3b8b03fc66f0 100644
--- a/devel/include-what-you-use/distinfo
+++ b/devel/include-what-you-use/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1699785878
+SHA256 (include-what-you-use-include-what-you-use-0.21_GH0.tar.gz) = a472fe8587376d041585c72e5643200f8929899f787725f0ba9e5b3d3820d401
+SIZE (include-what-you-use-include-what-you-use-0.21_GH0.tar.gz) = 776263
diff --git a/devel/include-what-you-use/pkg-plist b/devel/include-what-you-use/pkg-plist
index fd21748d2d95..eb97e180f0ef 100644
--- a/devel/include-what-you-use/pkg-plist
+++ b/devel/include-what-you-use/pkg-plist
@@ -1,23 +1,24 @@
 bin/fix_includes.py
 bin/include-what-you-use
 bin/iwyu_tool.py
 share/man/man1/include-what-you-use.1.gz
 %%DATADIR%%/boost-1.64-all-private.imp
 %%DATADIR%%/boost-1.64-all.imp
 %%DATADIR%%/boost-1.75-all-private.imp
 %%DATADIR%%/boost-1.75-all.imp
 %%DATADIR%%/boost-all-private.imp
 %%DATADIR%%/boost-all.imp
 %%DATADIR%%/clang-6.intrinsics.imp
 %%DATADIR%%/gcc-8.intrinsics.imp
 %%DATADIR%%/gcc.libc.imp
 %%DATADIR%%/gcc.stl.headers.imp
 %%DATADIR%%/gcc.symbols.imp
 %%DATADIR%%/iwyu.gcc.imp
 %%DATADIR%%/libcxx.imp
 %%DATADIR%%/python2.7.imp
 %%DATADIR%%/python3.8.imp
 %%DATADIR%%/qt4.imp
 %%DATADIR%%/qt5_11.imp
 %%DATADIR%%/qt5_4.imp
 %%DATADIR%%/stl.c.headers.imp
+%%DATADIR%%/stl.public.imp