diff --git a/CHANGES b/CHANGES
index 76f4577ab2..1ad375b30f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_deflate: permit compilation of mod_deflate against a zlib that has
+     been configured with -D Z_PREFIX, which redefines the token "deflate".
+     [Eric Covener]
+
   *) mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
      previously limited to 64MB. [Jens Låås <jelaas gmail.com>]
 
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 79f6f8d1ca..34de1d03d3 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -1551,6 +1551,10 @@ static const command_rec deflate_filter_cmds[] = {
     {NULL}
 };
 
+/* zlib can be built with #define deflate z_deflate */
+#ifdef deflate
+#undef deflate
+#endif
 AP_DECLARE_MODULE(deflate) = {
     STANDARD20_MODULE_STUFF,
     NULL,                         /* dir config creater */