diff --git a/busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch b/busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch
new file mode 100644
index 0000000..8fa4c35
--- /dev/null
+++ b/busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch
@@ -0,0 +1,13 @@
+diff -up busybox-1.37.0/libbb/hash_md5_sha.c.shaNI-fix busybox-1.37.0/libbb/hash_md5_sha.c
+--- busybox-1.37.0/libbb/hash_md5_sha.c.shaNI-fix	2024-09-27 09:57:09.601487627 -0400
++++ busybox-1.37.0/libbb/hash_md5_sha.c	2024-09-27 09:57:49.167153221 -0400
+@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *
+ 	hash_size = 8;
+ 	if (ctx->process_block == sha1_process_block64
+ #if ENABLE_SHA1_HWACCEL
++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ 	 || ctx->process_block == sha1_process_block64_shaNI
++# endif
+ #endif
+ 	) {
+ 		hash_size = 5;
diff --git a/busybox.changes b/busybox.changes
index 1a06141..145af6b 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  7 07:59:23 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add patch to fix build on non-x86* architectures:
+  * busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch
+
 -------------------------------------------------------------------
 Fri Oct  4 11:55:30 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/busybox.spec b/busybox.spec
index f332dcc..1440430 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -45,6 +45,8 @@ Patch2:         testsuite-gnu-echo.patch
 # Patch3:         ash-fix-segfault-d417193cf.patch
 Patch4:         udhcp6-install-path.patch
 Patch5:         tc-no-TCA_CBQ.patch
+# PATCH-FIX-UPSTREAM - Borrowed from Fedora - https://src.fedoraproject.org/rpms/busybox/blob/rawhide/f/busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch
+Patch6:         busybox-1.37.0-fix-conditional-for-sha1_process_block64_shaNI.patch
 # other patches
 Patch100:       busybox.install.patch
 BuildRequires:  glibc-devel-static