diff --git a/debian/changelog b/debian/changelog
index c85c74bc..cb8035d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-3.8 (1:3.8.1-5) UNRELEASED; urgency=medium
   * Try to fix mips64el build, by enabling the same
     packages as the mips and mipsel versions
   * Disable lldb on sparc64 (Closes: #832371)
+  * Hopefully fix the FTBFS on armel
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 22 Jul 2016 18:40:42 +0200
 
@@ -26,7 +27,7 @@ llvm-toolchain-3.8 (1:3.8.1-3) unstable; urgency=medium
 llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
-  * Add a symlink from usr/lib/llvm-3.8/share/llvm/cmake 
+  * Add a symlink from usr/lib/llvm-3.8/share/llvm/cmake
     pointing to usr/share/llvm-3.8/cmake
 
   [ Gianfranco Costamagna ]
diff --git a/debian/rules b/debian/rules
index 53b4316a..6b7baca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,9 @@ endif
 opt_flags = -g -O2
 ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
   opt_flags += -marm
+  # 3.8 fails to build, disable the compiler_rt builtins
+  # See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html
+  CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
 endif
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)