diff --git a/debian/README.source b/debian/README.source
index a5b685cc..fbd46fa2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,6 +4,13 @@ as possible from upstream.
 However, because of the objectives of Debian, besides paths, some changes are
 made.
 
+The Debian packaging is also used by apt.llvm.org.
+
+From 12.0.1-10 & 13.0.0-9, the build system use the runtimes build system.
+This is now the upstream preferred way to build llvm.
+It means that some projects like libc++ or compiler-rt are built once clang
+is built.
+
 = File names =
 
 * To make sure that most of the llvm-toolchain packages are co-installable,
diff --git a/debian/changelog b/debian/changelog
index 68c69319..bafe8dc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -155,9 +155,17 @@ 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.0-10) unstable; urgency=medium
+
+  * Add back -DLLVM_VERSION_SUFFIX=. Useless for 13 but necessary for snapshot
+    Otherwise, it adds "git" to the libs
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 11 Nov 2021 22:45:25 +0100
+
 llvm-toolchain-13 (1:13.0.0-9) unstable; urgency=medium
 
   * Upload to unstable (all green on exp)
+  * Fix an autopkgtest test (Closes: #997902)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 08 Nov 2021 14:09:25 +0100
 
@@ -752,7 +760,7 @@ llvm-toolchain-12 (1:12.0.0~++rc4-1) unstable; urgency=medium
 
 llvm-toolchain-12 (1:12.0.0~++rc3-4) unstable; urgency=medium
 
-  * dont' fail fsanitize=thread on i386, not supported
+  * Don't fail fsanitize=thread on i386, not supported
   * Don't hard fail on z3 failures with "set -e" at the begin, if z3 support is not available we do fail and exit testsuite without checking the log
   * Don't force gcc-11 anymore on riscv64, gcc-10 has the fixes now
 
diff --git a/debian/rules b/debian/rules
index 3ac22a0f..e4488601 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ include /usr/share/dpkg/buildflags.mk
 
 # We use a stage2 build. It means that a first clang is built using gcc,
 # a second clang is built with the first
-# And the various compoments are built using the second clang.
+# And the various components are built using the second clang.
 # See https://llvm.org/docs/AdvancedBuilds.html
 
 # collect additional flags for all stages all builds
@@ -490,6 +490,7 @@ override_dh_auto_configure: preconfigure
 	$(PRE_PROCESS_CONF) $(CMAKE_BIN) -S llvm/ -B $(TARGET_BUILD) \
 	-G $(GENERATOR) \
 	-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \
+	-DLLVM_VERSION_SUFFIX= \
 	-DCMAKE_SUPPRESS_REGENERATION=ON \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_C_FLAGS="$(STAGE_1_CFLAGS)" \