diff --git a/hotspot-aarch64.patch b/hotspot-aarch64.patch
new file mode 100644
index 0000000..baa48aa
--- /dev/null
+++ b/hotspot-aarch64.patch
@@ -0,0 +1,13 @@
+--- openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp	2019-05-24 21:46:57.000000000 +0200
++++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp	2019-10-17 12:04:06.232646618 +0200
+@@ -3281,8 +3281,8 @@ void LIR_Assembler::atomic_op(LIR_Code c
+           __ prfm(Address(tmp), PSTL1STRM);
+         __ bind(again);
+         (_masm->*lda)(dst, tmp);
+-        (_masm->*stl)(rscratch2, obj, tmp);
+-        __ cbnzw(rscratch2, again);
++        (_masm->*stl)(rscratch1, obj, tmp);
++        __ cbnzw(rscratch1, again);
+       }
+       if (is_oop && UseCompressedOops) {
+ 	__ decode_heap_oop(dst);
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 1d44342..fa9cc9f 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 21 06:41:23 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Apply hotspot-aarch64.patch only for aarch64, as some other 
+  archs (armv6/7) use other hotspot sources
+
+-------------------------------------------------------------------
+Thu Oct 17 10:07:15 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add patch to fix boo#1138529:
+  * hotspot-aarch64.patch
+
 -------------------------------------------------------------------
 Fri Jul 19 06:28:01 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index d9cdc74..1a14726 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -190,6 +190,8 @@ Patch14:        zero-javadoc-verbose.patch
 #
 # Patch for PPC
 Patch103:       ppc-zero-hotspot.patch
+# Patch for aarch64
+Patch104:       hotspot-aarch64.patch
 
 Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch1002:      icedtea-3.8.0-s390.patch
@@ -523,6 +525,10 @@ patch -p0 -i %{PATCH14}
 patch -p0 -i %{PATCH103}
 %endif
 
+%ifarch aarch64
+patch -p0 -i %{PATCH104}
+%endif
+
 patch -p0 -i %{PATCH2001}
 
 (cd openjdk/common/autoconf