diff --git a/debian/changelog b/debian/changelog
index d3452363..0ace8a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.0-1~exp4) UNRELEASED; urgency=medium
+
+  * Use 16 for wasm libs instead of 16.0.0
+    https://github.com/llvm/llvm-project/issues/61550
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 22 Mar 2023 23:36:45 +0100
+
 llvm-toolchain-16 (1:16.0.0-1~exp3) experimental; urgency=medium
 
   * Revert gold linker on riscv64, FTBFS
diff --git a/debian/rules b/debian/rules
index 21228a72..16461a7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -792,7 +792,7 @@ build-wasm/compiler-rt-%:
 		-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
 		-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL) \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION) \
 		-DCMAKE_INSTALL_DATADIR=lib \
 		-DCMAKE_INSTALL_INCLUDEDIR=include \
 		-DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR)/../ \
@@ -822,9 +822,9 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-%
 	# We need a wasm compiler-rt. Depend on the make target that builds it,
 	# and manually copy it to the stage2 lib dir from there
 	mkdir -p \
-	   $(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION_FULL)/lib/wasi/
+	   $(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION)/lib/wasi/
 	cp build-wasm/compiler-rt-$(cpu)/lib/wasi/libclang_rt.builtins-$(cpu).a \
-	   $(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION_FULL)/lib/wasi/
+	   $(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION)/lib/wasi/
 
 	# Notes:
 	# - Uses $(LDFLAGS) instead of $(STAGE_2_LDFLAGS), because wasm-ld does not