diff --git a/debian/changelog b/debian/changelog
index 7a83371d..c5e24492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ llvm-toolchain-7 (1:7.0.1~svn347285-1~exp1) UNRELEASED; urgency=medium
     hurd-cxx-paths.diff: New patches to fix hurd build.
 
   [ Sylvestre Ledru ]
-  * experimental New snapshot release
   * Remove mips-rdhwr.diff as it has been applied upstream
+  * Fix a baseline violation on armhf (Closes: #914268)
+    clang-arm-default-vfp3-on-armv7a.patch has been updated to disable
+    neon in another place
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 21 Nov 2018 09:45:00 +0100
 
diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
index ce4daf4e..7179927b 100644
--- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
+++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
@@ -11,3 +11,15 @@ Index: llvm-toolchain-7-7/include/llvm/Support/ARMTargetParser.def
  ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7,
            FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
            ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
+Index: llvm-toolchain-7-7/lib/Target/ARM/ARM.td
+===================================================================
+--- llvm-toolchain-7-7.orig/lib/Target/ARM/ARM.td
++++ llvm-toolchain-7-7/lib/Target/ARM/ARM.td
+@@ -558,7 +558,6 @@ def ARMv6sm   : Architecture<"armv6s-m",
+                                                        FeatureStrictAlign]>;
+ 
+ def ARMv7a    : Architecture<"armv7-a",   "ARMv7a",   [HasV7Ops,
+-                                                       FeatureNEON,
+                                                        FeatureDB,
+                                                        FeatureDSP,
+                                                        FeatureAClass]>;