diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes
index 0045daf..4fd22ff 100644
--- a/java-1_8_0-openj9.changes
+++ b/java-1_8_0-openj9.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 10 16:24:28 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Force DWARF version 4 when building with gcc >= 11
+  * the internal omr tools set error with debugging information
+    in DWARF5 format
+  * fixes build in factory
+
 -------------------------------------------------------------------
 Sun May 16 07:25:18 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 5bea9dc..7a0e52d 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -402,6 +402,20 @@ export ARCH_DATA_MODEL=64
  bash ./autogen.sh
 )
 
+EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -fno-delete-null-pointer-checks -fno-lifetime-dse"
+EXTRA_CPP_FLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
+
+%ifarch ppc64le
+EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
+%endif
+
+%if %{?pkg_vcmp:%pkg_vcmp gcc-c++ >= 11}%{!?pkg_vcmp:0}
+EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -g -gdwarf-4"
+EXTRA_CFLAGS="$EXTRA_CFLAGS -g -gdwarf-4"
+export CXXFLAGS="$EXTRA_CPP_FLAGS"
+export CFLAGS="$EXTRA_CFLAGS"
+%endif
+
 bash configure \
     --disable-zip-debug-info \
     --with-milestone="fcs" \