diff --git a/debian/changelog b/debian/changelog
index 37471822..99aeaacc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-15 (1:15.0.6-2) unstable; urgency=medium
+
+  * Fix build on riscv64 by disabling WASM for now.
+  * Explicitly depend on spirv-14 for riscv64, to bootstrap spirv there.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Nov 2022 15:31:52 +0100
+
 llvm-toolchain-15 (1:15.0.6-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 62b7be9f..6a62e658 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
-    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
+    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-14 [ riscv64 ],
     spirv-tools [ linux-any ] | hello [ !i386],
     libcurl4-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/rules b/debian/rules
index 0c47013f..edea5da9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -324,7 +324,7 @@ endif
 
 COMPILER_RT_WASM_ENABLE=yes
 
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel mips64el mipsel ppc64el armhf))
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel mips64el mipsel ppc64el armhf riscv64))
 	COMPILER_RT_WASM_ENABLE=no
 endif