diff --git a/dav1d.armv6.patch b/dav1d.armv6.patch
new file mode 100644
index 0000000..8a77a70
--- /dev/null
+++ b/dav1d.armv6.patch
@@ -0,0 +1,18 @@
+--- a/tests/checkasm/checkasm.h
++++ b/tests/checkasm/checkasm.h
+@@ -145,6 +145,7 @@ static inline uint64_t readtime(void) {
+ #define readtime readtime
+ #endif
+ #elif ARCH_ARM && !defined(_MSC_VER)
++#if __ARM_ARCH > 6
+ static inline uint64_t readtime(void) {
+     uint32_t cycle_counter;
+     /* This requires enabling user mode access to the cycle counter (which
+@@ -156,6 +157,7 @@ static inline uint64_t readtime(void) {
+ }
+ #define readtime readtime
+ #endif
++#endif
+ 
+ /* Verifies that clobbered callee-saved registers
+  * are properly saved and restored */
diff --git a/dav1d.changes b/dav1d.changes
index 89244af..1f53a39 100644
--- a/dav1d.changes
+++ b/dav1d.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 13 19:48:51 UTC 2019 - olaf@aepfle.de
+
+- Added dav1d.armv6.patch (disables armv7 asm for armv6 builds)
+
 -------------------------------------------------------------------
 Sat May 11 16:06:40 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
 
diff --git a/dav1d.spec b/dav1d.spec
index ef0080d..b7af468 100644
--- a/dav1d.spec
+++ b/dav1d.spec
@@ -26,6 +26,8 @@ Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            https://code.videolan.org/videolan/dav1d
 Source0:        https://code.videolan.org/videolan/dav1d/-/archive/%{version}/dav1d-%{version}.tar.gz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM dav1d.armv6.patch olaf@aepfle.de -- disable armv7 asm for armv6 builds
+Patch0:         dav1d.armv6.patch
 BuildRequires:  meson >= 0.47.0
 BuildRequires:  nasm
 BuildRequires:  pkgconfig
@@ -60,7 +62,7 @@ Group:          System/Libraries
 %{name} is an AV1 decoder library.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %meson