diff --git a/debian/changelog b/debian/changelog
index b1cf9eb9..513eb1e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium
 
   [ Sylvestre Ledru ]
   * First RC release
+  * For now, disable ThinLTO usage because:
+      - LLVM_ENABLE_LTO doesn't work with gcc >= 9 (option not accepted)
+      - BOOTSTRAP_LLVM_ENABLE_LTO is producing some large binary
+        (uses llvm ir instead of binary code)
+        See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943623
+  * Thanks to this previous change, don't hardcode gcc 8
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 03 Feb 2020 10:30:50 +0100
 
diff --git a/debian/rules b/debian/rules
index bad4730a..0be82d06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -235,7 +235,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 # armhf is not yet quite ready for Thin, it FTBFS
 # see https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-8&arch=armhf&ver=1%3A8.0.1%7E%2Brc2-1%7Eexp1&stamp=1560334266&raw=0
 ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
-	CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+# Use BOOTSTRAP_LLVM_ENABLE_LTO to make sure that it isn't used
+# when running stage1 with gcc
+# For now, disable ThinLTO usage because:
+# * LLVM_ENABLE_LTO doesn't work with gcc >= 9 (option not accepted)
+# * BOOTSTRAP_LLVM_ENABLE_LTO is producing some large binary
+#   See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943623
+#	CMAKE_EXTRA += -DBOOTSTRAP_LLVM_ENABLE_LTO="Thin"
 endif
 endif
 endif