diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..d112961
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<constraints>
+  <overwrite>
+    <conditions>
+      <arch>armv6l</arch>
+      <arch>armv7l</arch>
+      <arch>aarch64</arch>
+    </conditions>
+    <hardware>
+      <physicalmemory>
+        <size unit="G">8</size>
+      </physicalmemory>
+    </hardware>
+  </overwrite>
+</constraints>
diff --git a/gnuradio.changes b/gnuradio.changes
index c54428f..943bafc 100644
--- a/gnuradio.changes
+++ b/gnuradio.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug 30 18:35:50 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Disable explictly neon on armv6 to fix build
+
+-------------------------------------------------------------------
+Thu Aug 30 14:08:51 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add _constraints for ARM to speed-up build
+
 -------------------------------------------------------------------
 Wed Jul 18 16:41:20 UTC 2018 - wk@ire.pw.edu.pl
 
diff --git a/gnuradio.spec b/gnuradio.spec
index b60f657..63b5827 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -201,7 +201,11 @@ sed -i 's|^HTML_TIMESTAMP         = YES|HTML_TIMESTAMP         = NO|' docs/doxyg
 
 %build
 %limit_build -m 2000
-%cmake
+%ifnarch armv6l armv6hl
+  %cmake
+%else
+  %cmake -Dhave_mfpu_neon=0
+%endif
 %make_jobs
 
 %install