diff --git a/zstd.changes b/zstd.changes
index 1820c5f..288c2da 100644
--- a/zstd.changes
+++ b/zstd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 11 18:28:45 UTC 2021 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add zstd-1.4.9-Avoid-SIGBUS-on-armv6.patch
+  to fix crashes when running armv6 userspace on armv8 64-bit kernels
+
 -------------------------------------------------------------------
 Thu Mar  4 01:36:14 UTC 2021 - Bernhard Wiedemann <bwiedemann@suse.com>
 
diff --git a/zstd.spec b/zstd.spec
index 2d2cbe3..e02c50f 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -28,6 +28,8 @@ URL:            https://github.com/facebook/zstd
 Source0:        https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
 Patch1:         pzstd.1.patch
+# PATCH-FIX-UPSTREAM https://github.com/facebook/zstd/pull/2633
+Patch2:         zstd-1.4.9-Avoid-SIGBUS-on-armv6.patch
 BuildRequires:  gcc
 # C++ is needed for pzstd only
 BuildRequires:  gcc-c++
@@ -82,8 +84,7 @@ targeting faster compression than zlib at comparable ratios.
 Needed for compiling programs that link with the library.
 
 %prep
-%setup -q
-%patch1 -p1
+%autosetup -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects