diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile
index 6ef76e519cd0..2b3155563b89 100644
--- a/devel/wasi-libc/Makefile
+++ b/devel/wasi-libc/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	wasi-libc
 DISTVERSIONPREFIX=	wasi-sdk-
 DISTVERSION=	31
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${FLAVOR}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	C standard library for WebAssembly System Interface
 WWW=		https://github.com/WebAssembly/wasi-libc
 
 LICENSE=	APACHE20 MIT LLVM2
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE-APACHE-LLVM
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	bash:shells/bash \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 
-FLAVORS=	19 20 21 18 17
+FLAVORS=	19 20 21 22 18 17
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cmake llvm:${FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
 GH_TUPLE=	WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI
 NO_ARCH=	yes
 PLIST=		${PKGDIR}/pkg-plist${LLVM_VERSION}
 CONFLICTS_INSTALL=	wasi-libc[0-9]*
 
 # NOTE: matches the https://github.com/WebAssembly/wasi-sdk
 WASI_SYSROOT=	${PREFIX}/share/wasi-sysroot
 
 CMAKE_INSTALL_PREFIX=	${WASI_SYSROOT}
 CMAKE_ARGS=	-DCMAKE_C_COMPILER=clang${LLVM_VERSION} \
 		-DCMAKE_AR=llvm-ar${LLVM_VERSION} \
 		-DCMAKE_NM=llvm-nm${LLVM_VERSION} \
 		-DCMAKE_RANLIB=llvm-ranlib${LLVM_VERSION} \
 		-DTARGET_TRIPLE=wasm32-wasi \
 		-DBUILTINS_LIB=${LLVM_PREFIX:S/${PREFIX}/${LOCALBASE}/}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a \
 		-DBUILD_SHARED=OFF
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-libc/pkg-plist22 b/devel/wasi-libc/pkg-plist22
new file mode 100644
index 000000000000..70134a9ade3b
--- /dev/null
+++ b/devel/wasi-libc/pkg-plist22
@@ -0,0 +1,225 @@
+share/wasi-sysroot/include/wasm32-wasi/__errno.h
+share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__seek.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+share/wasi-sysroot/include/wasm32-wasi/alloca.h
+share/wasi-sysroot/include/wasm32-wasi/ar.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+share/wasi-sysroot/include/wasm32-wasi/assert.h
+share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
+share/wasi-sysroot/include/wasm32-wasi/bits/io.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
+share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
+share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
+share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+share/wasi-sysroot/include/wasm32-wasi/complex.h
+share/wasi-sysroot/include/wasm32-wasi/cpio.h
+share/wasi-sysroot/include/wasm32-wasi/crypt.h
+share/wasi-sysroot/include/wasm32-wasi/ctype.h
+share/wasi-sysroot/include/wasm32-wasi/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+share/wasi-sysroot/include/wasm32-wasi/endian.h
+share/wasi-sysroot/include/wasm32-wasi/err.h
+share/wasi-sysroot/include/wasm32-wasi/errno.h
+share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/features.h
+share/wasi-sysroot/include/wasm32-wasi/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/float.h
+share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+share/wasi-sysroot/include/wasm32-wasi/fts.h
+share/wasi-sysroot/include/wasm32-wasi/ftw.h
+share/wasi-sysroot/include/wasm32-wasi/getopt.h
+share/wasi-sysroot/include/wasm32-wasi/glob.h
+share/wasi-sysroot/include/wasm32-wasi/iconv.h
+share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/iso646.h
+share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+share/wasi-sysroot/include/wasm32-wasi/libgen.h
+share/wasi-sysroot/include/wasm32-wasi/limits.h
+share/wasi-sysroot/include/wasm32-wasi/locale.h
+share/wasi-sysroot/include/wasm32-wasi/malloc.h
+share/wasi-sysroot/include/wasm32-wasi/math.h
+share/wasi-sysroot/include/wasm32-wasi/memory.h
+share/wasi-sysroot/include/wasm32-wasi/monetary.h
+share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+share/wasi-sysroot/include/wasm32-wasi/poll.h
+share/wasi-sysroot/include/wasm32-wasi/pthread.h
+share/wasi-sysroot/include/wasm32-wasi/regex.h
+share/wasi-sysroot/include/wasm32-wasi/sched.h
+share/wasi-sysroot/include/wasm32-wasi/search.h
+share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+share/wasi-sysroot/include/wasm32-wasi/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/signal.h
+share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+share/wasi-sysroot/include/wasm32-wasi/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/stdio.h
+share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+share/wasi-sysroot/include/wasm32-wasi/string.h
+share/wasi-sysroot/include/wasm32-wasi/strings.h
+share/wasi-sysroot/include/wasm32-wasi/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+share/wasi-sysroot/include/wasm32-wasi/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+share/wasi-sysroot/include/wasm32-wasi/tar.h
+share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+share/wasi-sysroot/include/wasm32-wasi/threads.h
+share/wasi-sysroot/include/wasm32-wasi/time.h
+share/wasi-sysroot/include/wasm32-wasi/uchar.h
+share/wasi-sysroot/include/wasm32-wasi/unistd.h
+share/wasi-sysroot/include/wasm32-wasi/utime.h
+share/wasi-sysroot/include/wasm32-wasi/values.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/version.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip1.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip3.h
+share/wasi-sysroot/include/wasm32-wasi/wchar.h
+share/wasi-sysroot/include/wasm32-wasi/wctype.h
+share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1.o
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.a
+share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
+share/wasi-sysroot/lib/wasm32-wasi/libdl.a
+share/wasi-sysroot/lib/wasm32-wasi/libm.a
+share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
+share/wasi-sysroot/lib/wasm32-wasi/librt.a
+share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
+share/wasi-sysroot/lib/wasm32-wasi/libutil.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
+share/wasi-sysroot/lib/wasm32-wasi/libxnet.a