diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes
index 946ac1c..fb7277e 100644
--- a/java-1_8_0-openj9.changes
+++ b/java-1_8_0-openj9.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 28 10:02:44 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * stringop-overflow.patch
+    + disable -Wstringop-overflow and fix build in Factory
+
 -------------------------------------------------------------------
 Mon Mar  6 09:04:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 29cd107..46f586b 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -114,6 +114,8 @@ Patch3:         disable-doclint-by-default.patch
 Patch4:         libdwarf-fix.patch
 # Fix narrowing conversion error
 Patch5:         openj9-no-narrowing.patch
+# Fix build with gcc 13
+Patch32:        stringop-overflow.patch
 # Patches for system libraries
 Patch201:       system-libjpeg.patch
 Patch202:       system-libpng.patch
@@ -360,6 +362,8 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch4 -p1
 %patch5 -p1
 
+%patch32 -p1
+
 %patch300 -p1
 
 cat %{SOURCE100} \
diff --git a/stringop-overflow.patch b/stringop-overflow.patch
new file mode 100644
index 0000000..3f0a6a3
--- /dev/null
+++ b/stringop-overflow.patch
@@ -0,0 +1,20 @@
+diff -urEbwB openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp
+--- openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp	2023-03-28 09:18:57.979474249 +0200
++++ openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp	2023-03-28 09:49:47.316000333 +0200
+@@ -22,6 +22,9 @@
+ #ifndef OMR_SIMPLIFIERHANDLERS_INCL
+ #define OMR_SIMPLIFIERHANDLERS_INCL
+ 
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wstringop-overflow"
++
+ #include "optimizer/OMRSimplifierHelpers.hpp"
+ #include "optimizer/OMRSimplifierHandlers.hpp"
+ 
+@@ -17404,5 +17407,6 @@
+    return node;
+    }
+ 
++#pragma GCC diagnostic pop
+ 
+ #endif