diff --git a/brotli b/brotli
index ed738e8..028fb5a 160000
--- a/brotli
+++ b/brotli
@@ -1 +1 @@
-Subproject commit ed738e842d2fbdf2d6459e39267a633c4a9b2f5d
+Subproject commit 028fb5a23661f123017c060daa546b55cf4bde29
diff --git a/config.m4 b/config.m4
index 106bf34..2740ce9 100644
--- a/config.m4
+++ b/config.m4
@@ -103,13 +103,17 @@ if test "$PHP_BROTLI" != "no"; then
       brotli/c/enc/memory.c
       brotli/c/enc/metablock.c
       brotli/c/enc/static_dict.c
+      brotli/c/enc/static_dict_lut.c
+      brotli/c/enc/static_init.c
       brotli/c/enc/utf8_util.c
     "
     BROTLI_DEC_SOURCES="
       brotli/c/dec/bit_reader.c
       brotli/c/dec/decode.c
       brotli/c/dec/huffman.c
+      brotli/c/dec/prefix.c
       brotli/c/dec/state.c
+      brotli/c/dec/static_init.c
     "
 
     AC_DEFINE(USE_BROTLI_BUNDLED, 1, [use bundled])
diff --git a/config.w32 b/config.w32
index 330cdbf..c135f64 100644
--- a/config.w32
+++ b/config.w32
@@ -12,9 +12,59 @@ if (PHP_BROTLI != "no") {
     }
   } else {
     EXTENSION("brotli", "brotli.c", PHP_BROTLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
-    ADD_SOURCES("brotli/c/common", "constants.c context.c dictionary.c platform.c shared_dictionary.c transform.c", "brotli");
-    ADD_SOURCES("brotli/c/enc", "backward_references.c backward_references_hq.c bit_cost.c block_splitter.c brotli_bit_stream.c cluster.c command.c compound_dictionary.c compress_fragment.c compress_fragment_two_pass.c dictionary_hash.c encode.c encoder_dict.c entropy_encode.c fast_log.c histogram.c literal_cost.c memory.c metablock.c static_dict.c utf8_util.c", "brotli");
-    ADD_SOURCES("brotli/c/dec", "bit_reader.c decode.c huffman.c state.c", "brotli");
+    ADD_SOURCES(
+      "brotli/c/common",
+      [
+        "constants.c",
+        "context.c",
+        "dictionary.c",
+        "platform.c",
+        "shared_dictionary.c",
+        "transform.c"
+      ].join(" "),
+      "brotli",
+      "brotli\\c\\common");
+    ADD_SOURCES(
+      "brotli/c/enc",
+      [
+        "backward_references.c",
+        "backward_references_hq.c",
+        "bit_cost.c",
+        "block_splitter.c",
+        "brotli_bit_stream.c",
+        "cluster.c",
+        "command.c",
+        "compound_dictionary.c",
+        "compress_fragment.c",
+        "compress_fragment_two_pass.c",
+        "dictionary_hash.c",
+        "encode.c",
+        "encoder_dict.c",
+        "entropy_encode.c",
+        "fast_log.c",
+        "histogram.c",
+        "literal_cost.c",
+        "memory.c",
+        "metablock.c",
+        "static_dict.c",
+        "static_dict_lut.c",
+        "static_init.c",
+        "utf8_util.c"
+      ].join(" "),
+      "brotli",
+      "brotli\\c\\enc");
+    ADD_SOURCES(
+      "brotli/c/dec",
+      [
+        "bit_reader.c",
+        "decode.c",
+        "huffman.c",
+        "prefix.c",
+        "state.c",
+        "static_init.c"
+      ].join(" "),
+      "brotli",
+      "brotli\\c\\dec");
 
     ADD_FLAG("CFLAGS_BROTLI", " /I" + configure_module_dirname + " /I" + configure_module_dirname + "/brotli/c/include");
 
diff --git a/tests/compatibility.phpt b/tests/compatibility.phpt
index 9c7511d..7a0f916 100644
--- a/tests/compatibility.phpt
+++ b/tests/compatibility.phpt
@@ -234,3 +234,7 @@ Testing decompression of file zeros.compressed
   read uncompressed .. OK
   compressed        .. OK
   uncompressed      .. OK
+Testing decompression of file zerosukkanooa.compressed
+  read uncompressed .. OK
+  compressed        .. OK
+  uncompressed      .. OK