diff --git a/onednn-xbyak-aarch64.patch b/onednn-xbyak-aarch64.patch
new file mode 100644
index 0000000..4b97b5c
--- /dev/null
+++ b/onednn-xbyak-aarch64.patch
@@ -0,0 +1,21 @@
+From ecb940c16aef22ee5a3aa64a3745c277f6de52c0 Mon Sep 17 00:00:00 2001
+From: Kentaro Kawakami <kawakami.k@fujitsu.com>
+Date: Sun, 13 Jun 2021 13:14:34 +0900
+Subject: [PATCH] fix gcc-11 compile error
+
+---
+ src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
+index 20e4665..7e03812 100644
+--- a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
++++ b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
+@@ -28,6 +28,7 @@
+ #include <deque>
+ #include <initializer_list>
+ #include <iostream>
++#include <limits>
+ #include <list>
+ #include <type_traits>
+ #include <unordered_map>
diff --git a/onednn.changes b/onednn.changes
index 9ec08e3..d5ccef8 100644
--- a/onednn.changes
+++ b/onednn.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 15 12:10:39 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix build on aarch64:
+  * onednn-xbyak-aarch64.patch
+
 -------------------------------------------------------------------
 Tue Jun 15 08:31:16 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/onednn.spec b/onednn.spec
index 11fc3c6..e786823 100644
--- a/onednn.spec
+++ b/onednn.spec
@@ -39,6 +39,8 @@ URL:            https://01.org/onednn
 Source0:        https://github.com/oneapi-src/oneDNN/archive/v%{version}/oneDNN-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM onednn-1045.patch -- https://github.com/oneapi-src/oneDNN/pull/1045
 Patch0:         onednn-1045.patch
+# PATCH-FIX-UPSTREAM - https://github.com/oneapi-src/oneDNN/issues/1085
+Patch1:         onednn-xbyak-aarch64.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  fdupes