diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes
index 4fd22ff..cd78ad3 100644
--- a/java-1_8_0-openj9.changes
+++ b/java-1_8_0-openj9.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 18 10:15:55 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Remove the forcing of DWARF version 4, since the libdwarf in
+  factory works correctly with this build and DWARF5 symbol format
+- Expand supported architectures to aarch64
+
 -------------------------------------------------------------------
 Thu Jun 10 16:24:28 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 1435df5..2752b4f 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -210,9 +210,6 @@ Provides:       jre1.6.x
 Provides:       jre1.7.x
 Provides:       jre1.8.x
 ExclusiveArch:  x86_64 ppc64le s390x aarch64
-%if %{?pkg_vcmp:%pkg_vcmp gcc-c++ >= 11}%{!?pkg_vcmp:0}
-BuildRequires:  libdwarf-devel >= 20210528
-%endif
 %if %{bootcycle}
 BuildRequires:  java-devel >= 1.7
 BuildConflicts: java >= 9