diff --git a/clamav-fix_newer_zlib.patch b/clamav-fix_newer_zlib.patch
new file mode 100644
index 0000000..11e9dd9
--- /dev/null
+++ b/clamav-fix_newer_zlib.patch
@@ -0,0 +1,52 @@
+Description: fix compatibility with zlib 1.2.9 and newer
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
+
+Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c
+===================================================================
+--- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c	2017-08-08 15:20:06.651685637 -0400
++++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c	2017-08-15 15:45:14.645714766 -0400
+@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
+         cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
+         return -1;
+     }
+-    memset(&stream, 0, sizeof(stream));
+-    ret = inflateInit2(&stream, windowBits);
++
++    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
++    if (!b) {
++        return -1;
++    }
++    ctx->inflates = b;
++    ctx->ninflates = n;
++    b = &b[n-1];
++
++    b->from = from;
++    b->to = to;
++    b->needSync = 0;
++    memset(&b->stream, 0, sizeof(stream));
++    ret = inflateInit2(&b->stream, windowBits);
+     switch (ret) {
+         case Z_MEM_ERROR:
+             cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
+@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
+             cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
+             return -1;
+     }
+-
+-    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
+-    if (!b) {
+-        inflateEnd(&stream);
+-        return -1;
+-    }
+-    ctx->inflates = b;
+-    ctx->ninflates = n;
+-    b = &b[n-1];
+-
+-    b->from = from;
+-    b->to = to;
+-    b->needSync = 0;
+-    memcpy(&b->stream, &stream, sizeof(stream));
+     return n-1;
+ }
+ 
diff --git a/clamav.changes b/clamav.changes
index 391ba32..1a0660e 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 21 13:41:14 UTC 2017 - fvogt@suse.com
+
+- Add clamav-fix_newer_zlib.patch from ubuntu packages to fix build with
+  zlib 1.2.11 (boo#1041201)
+
 -------------------------------------------------------------------
 Tue Aug  1 18:40:35 CEST 2017 - ro@suse.de
 
diff --git a/clamav.spec b/clamav.spec
index 11c9461..8b50dfe 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -58,6 +58,7 @@ Source9:        service.clamav-milter
 Patch1:         clamav-conf.patch
 Patch3:         clamav-gcc47.patch
 Patch4:         clamav-disable-timestamps.patch
+Patch5:         clamav-fix_newer_zlib.patch
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
 %systemd_requires
@@ -77,6 +78,7 @@ detecting threats.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 CFLAGS="-fstack-protector"