diff --git a/debian/changelog b/debian/changelog
index f0079b1f..0c033668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-3.9 (1:3.9-5) UNRELEASED; urgency=medium
+
+  * d/p/no-neon-on-armhf.patch: avoid defaulting to NEON instructions
+    for armhf (Closes: #842143).
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 04 Nov 2016 12:27:42 +0100
+
 llvm-toolchain-3.9 (1:3.9-4) unstable; urgency=medium
 
   * d/p/bug-30342.diff:
diff --git a/debian/patches/no-neon-on-armhf.patch b/debian/patches/no-neon-on-armhf.patch
new file mode 100644
index 00000000..ec8b356c
--- /dev/null
+++ b/debian/patches/no-neon-on-armhf.patch
@@ -0,0 +1,18 @@
+Description: Patch suggested from upstream, to build without a default NEON for arm*
+
+Bug-Debian: https://bugs.debian.org/842142
+Bug-Debian: https://bugs.debian.org/842143
+
+Index: llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp
+===================================================================
+--- llvm-toolchain-3.9-3.9.orig/clang/lib/Driver/Tools.cpp
++++ llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp
+@@ -9073,7 +9073,7 @@
+     const llvm::Triple &Triple2 = getToolChain().getTriple();
+     switch (Triple2.getSubArch()) {
+     case llvm::Triple::ARMSubArch_v7:
+-      CmdArgs.push_back("-mfpu=neon");
++      CmdArgs.push_back("-mfpu=vfp");
+       break;
+     case llvm::Triple::ARMSubArch_v8:
+       CmdArgs.push_back("-mfpu=crypto-neon-fp-armv8");
diff --git a/debian/patches/series b/debian/patches/series
index a6314da6..a3824e86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,5 @@ clang-tidy-run-bin.diff
 drop-wrong-hack-arm64.patch
 bug-30342.diff
 fix-scan-view-path.diff
+
+no-neon-on-armhf.patch