diff --git a/bsc1210593.patch b/bsc1210593.patch
new file mode 100644
index 0000000..c6c5ec3
--- /dev/null
+++ b/bsc1210593.patch
@@ -0,0 +1,13 @@
+Index: zlib-1.2.11/contrib/s390/dfltcc_deflate.h
+===================================================================
+--- zlib-1.2.11.orig/contrib/s390/dfltcc_deflate.h
++++ zlib-1.2.11/contrib/s390/dfltcc_deflate.h
+@@ -45,7 +45,7 @@ int ZLIB_INTERNAL dfltcc_deflate_get_dic
+ #define DEFLATE_DONE dfltcc_deflate_done
+ #define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, source_len) \
+     do { \
+-        if (dfltcc_can_deflate((strm))) \
++        if (deflateStateCheck((strm)) || dfltcc_can_deflate((strm))) \
+             (complen) = DEFLATE_BOUND_COMPLEN(source_len); \
+     } while (0)
+ #define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) (dfltcc_can_deflate((strm)))
diff --git a/zlib.changes b/zlib.changes
index 9c70841..8307a83 100644
--- a/zlib.changes
+++ b/zlib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  5 09:56:31 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Fix deflateBound() before deflateInit(), bsc#1210593, bsc#1211005
+  bsc1210593.patch
+
 -------------------------------------------------------------------
 Wed Mar  1 17:50:05 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/zlib.spec b/zlib.spec
index 9fdf462..b245b8c 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -53,6 +53,9 @@ Patch15:        zlib-1.2.12-adler32-vector-optimizations-for-power.patch
 Patch16:        zlib-1.2.12-fix-invalid-memory-access-on-ppc-and-ppc64.patch
 Patch17:        zlib-1.2.12-add-optimized-slide_hash-for-power.patch
 Patch18:        zlib-1.2.12-add-vectorized-longest_match-for-power.patch
+# PATCH-FIX-UPSTREAM danilo.spinella@suse.com bsc#1210593 bsc#1211005
+# Fix deflateBound() before deflateInit()
+Patch19:        bsc1210593.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -155,6 +158,7 @@ It should exit 0
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 cp %{SOURCE4} .
 
 %build