diff --git a/debian/changelog b/debian/changelog
index 68ebf4f3..34ac6159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -482,6 +482,27 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Aug 2021 08:40:58 +0200
 
+llvm-toolchain-13 (1:13.0.1-9) UNRELEASED; urgency=medium
+
+  * d/rules: Don't send an empty string to cmake when llvm-spirv is not found
+
+ -- Jordan Justen <jljusten@debian.org>  Fri, 28 Oct 2022 10:17:57 -0700
+
+llvm-toolchain-13 (1:13.0.1-8) unstable; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * Disable the build of libclc on old Ubuntu (Groovy & focal)
+    as llvm-spir is too old on these version.
+    See bug #52200
+
+  [ Jordan Justen ]
+  * d/rules: Call bash to use 'command -v' to location llvm-spirv executable
+  * d/rules: Set LLVM_SPIRV with cmake for libclc
+  * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV
+  * d/rules: Check for llvm-spirv with version suffix
+
+ -- Jordan Justen <jljusten@debian.org>  Wed, 26 Oct 2022 10:13:59 -0700
+
 llvm-toolchain-13 (1:13.0.1-7) unstable; urgency=medium
 
   [ Michael Biebl ]
diff --git a/debian/rules b/debian/rules
index 09938ac3..c69afcc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -243,10 +243,10 @@ else
 endif
 
 LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
-LIBCLC_TARGETS_LLVM_SPIRV := ""
+LIBCLC_TARGETS_LLVM_SPIRV =
 ifeq ($(LLVM_SPIRV_INSTALLED),yes)
 	LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-"
-	LIBCLC_TARGETS_LLVM_SPIRV := "-DLLVM_SPIRV=$(LLVM_SPIRV)"
+	LIBCLC_TARGETS_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
 endif
 
 BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386