diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00ac11c20..0671c078f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(zlib C)
 
diff --git a/inflate.c b/inflate.c
index 0cb62486d..af3b2a7ba 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1529,8 +1529,12 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     if (copy == Z_NULL) return Z_MEM_ERROR;
     window = Z_NULL;
     if (state->window != Z_NULL) {
+        unsigned wsize_padded = 1U << state->wbits;
+        #if defined(INFLATE_CHUNK_SIMD_NEON) || defined(INFLATE_CHUNK_SIMD_SSE2)
+        wsize_padded += CHUNKCOPY_CHUNK_SIZE;
+        #endif
         window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+                 ZALLOC(source, wsize_padded, sizeof(unsigned char));
         if (window == Z_NULL) {
             ZFREE(source, copy);
             return Z_MEM_ERROR;
diff --git a/ucm.cmake b/ucm.cmake
index 7eb2efb14..38fe8577b 100644
--- a/ucm.cmake
+++ b/ucm.cmake
@@ -10,7 +10,7 @@
 # The documentation can be found at the library's page:
 # https://github.com/onqtam/ucm
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 include(CMakeParseArguments)