Index: devel/wasi-libc/Makefile
===================================================================
--- devel/wasi-libc/Makefile
+++ devel/wasi-libc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wasi-libc
-DISTVERSION=	g20210923
+DISTVERSION=	g20220509
 CATEGORIES=	devel
 
 MAINTAINER=	greg@unrelenting.technology
@@ -18,27 +18,27 @@
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
-GH_TAGNAME=	ad5133410f66b93a2381db5b542aad5e0964db96
-GH_TUPLE=	WebAssembly:WASI:ef8c1a53fe:wasi/tools/wasi-headers/WASI
+GH_TAGNAME=	9886d3d6200fcc3726329966860fc058707406cd
+GH_TUPLE=	WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI
 NO_ARCH=	yes
-LLVM_VERSION?=	13
+LLVM_VERSION?=	14
 
 ALL_TARGET=	finish
 
-# NOTE: matches the https://github.com/CraneStation/wasi-sdk
+# NOTE: matches the https://github.com/WebAssembly/wasi-sdk
 WASI_SYSROOT=	${PREFIX}/share/wasi-sysroot
 
 # NOTE: our llvm ports don't ship stdarg/stddef clang headers, so they're in FILESDIR
 #       and we install them to the sysroot
 
+CC=	${LOCALBASE}/bin/clang${LLVM_VERSION}
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${WASI_SYSROOT} \
-		WASM_AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
-		WASM_CC=${LOCALBASE}/bin/clang${LLVM_VERSION} \
-		WASM_CFLAGS="-O2 -DNDEBUG -isystem ${FILESDIR}" \
-		WASM_NM=${LOCALBASE}/bin/llvm-nm${LLVM_VERSION}
+		EXTRA_CFLAGS="-O2 -DNDEBUG -isystem ${FILESDIR}" \
+		AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
+		NM=${LOCALBASE}/bin/llvm-nm${LLVM_VERSION}
 
 # NOTE: phony targets cause make install to rebuild everything
-#       https://github.com/CraneStation/wasi-libc/issues/156
+#       https://github.com/WebAssembly/wasi-libc/issues/156
 post-patch:
 	${REINPLACE_CMD} -e 's|install: finish|install:|' ${WRKSRC}/Makefile
 
Index: devel/wasi-libc/distinfo
===================================================================
--- devel/wasi-libc/distinfo
+++ devel/wasi-libc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1633602535
-SHA256 (WebAssembly-wasi-libc-g20210923-ad5133410f66b93a2381db5b542aad5e0964db96_GH0.tar.gz) = 085ab45e0591041a8dc104978ad3ff72589072161a922011762d53bf07169ac2
-SIZE (WebAssembly-wasi-libc-g20210923-ad5133410f66b93a2381db5b542aad5e0964db96_GH0.tar.gz) = 1251318
-SHA256 (WebAssembly-WASI-ef8c1a53fe_GH0.tar.gz) = 38be36dc47d79f60aadd1bb3deff391594ff6797260c4810cec0e781ad90ec3c
-SIZE (WebAssembly-WASI-ef8c1a53fe_GH0.tar.gz) = 334921
+TIMESTAMP = 1652664024
+SHA256 (WebAssembly-wasi-libc-g20220509-9886d3d6200fcc3726329966860fc058707406cd_GH0.tar.gz) = bba1676fd658ade3a18662d0db9b23268f188cfc8ae8cb2c6843b0c18043ab08
+SIZE (WebAssembly-wasi-libc-g20220509-9886d3d6200fcc3726329966860fc058707406cd_GH0.tar.gz) = 1251824
+SHA256 (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 4e36c4add2421b44ccdded83d442d9aadf02ffa8b534d94016fad2bb7b781cc6
+SIZE (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 162059
Index: devel/wasi-libc/pkg-descr
===================================================================
--- devel/wasi-libc/pkg-descr
+++ devel/wasi-libc/pkg-descr
@@ -5,4 +5,4 @@
 for standard I/O, file I/O, filesystem manipulation, memory management, time,
 string, environment variables, program startup, and many other APIs.
 
-WWW: https://github.com/CraneStation/wasi-libc
+WWW: https://github.com/WebAssembly/wasi-libc