diff --git a/debian/changelog b/debian/changelog
index be8cf0e8..f9b9f1e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,21 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 28 Jan 2023 18:07:40 +0100
 
+llvm-toolchain-16 (1:16.0.0-1~exp5) experimental; urgency=medium
+
+  * Don't ship liborc on armel too
+  * Install ASAN symbolize on riscv64
+  * Limit parallel building to 3 on riscv64, should speed up extremely slow builds due to too many concurrent threads
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Mar 2023 08:53:13 +0200
+
+llvm-toolchain-16 (1:16.0.0-1~exp4) experimental; 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/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index b31e5f9d..6a0d0c4c 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -61,7 +61,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
 
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
+[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index 8891a735..786f4c65 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -7,4 +7,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
 # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
-[amd64 armhf arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+[amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
diff --git a/debian/rules b/debian/rules
index d334a564..2fa75e5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,6 +207,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 endif
 
+# more than 4 jobs causes OOM in Ubuntu and slows down build process.
+ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
+  NJOBS=3
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH),sparc))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc-linux-gnu
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
@@ -800,7 +805,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)/../ \
@@ -830,9 +835,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