diff --git a/debian/changelog b/debian/changelog
index ff3d0193..89fd47fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.6-9) unstable; urgency=medium
+
+  * Really enable spirv, and disable spirv on mips* since it's not yet
+    bootstrapped. Thanks <tjaalton> for the patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 03 Aug 2023 14:20:06 +0200
+
 llvm-toolchain-16 (1:16.0.6-8) unstable; urgency=medium
 
   * Make sure flang-16 depends on libflang-16-dev (Closes: #1041202)
diff --git a/debian/control b/debian/control
index 21544e04..7ce9ed6a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ 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-16 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> |
     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],
     spirv-tools [ linux-any ] | hello [ !i386],
diff --git a/debian/control.in b/debian/control.in
index d807aa72..ae027566 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,7 +22,7 @@ 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-16 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> |
     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],
     spirv-tools [ linux-any ] | hello [ !i386],
diff --git a/debian/rules b/debian/rules
index a1d69fa2..f982b0ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -249,9 +249,6 @@ ifndef LLVM_SPIRV
 	LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1)
 	LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 endif
-# For now, disable spir because it needs
-# 16 because of opaque pointers
-undefine LLVM_SPIRV
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else