diff --git a/ChangeLog.txt b/ChangeLog.txt
index 88a4f336a..96bc8940b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 Change log:
 
+Version 1.6.17 (built with libpng-1.2.35 and zlib-1.2.3.2)
+  Defined TOO_FAR == 32767 in deflate.c (again).  The definition
+    has continually been inadvertently omitted during zlib updates
+    since pngcrush version 1.6.4.
+
 Version 1.6.16 (built with libpng-1.2.35 and zlib-1.2.3.2)
   Added -newtimestamp and -oldtimestamp options and changed
     default condition to timestamping the output file with
diff --git a/deflate.c b/deflate.c
index fc41b8052..b024947a3 100644
--- a/deflate.c
+++ b/deflate.c
@@ -105,6 +105,11 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
 #define NIL 0
 /* Tail of hash chains */
 
+
+#ifndef TOO_FAR
+#define TOO_FAR 32767 /* pngcrush mod */
+#endif
+
 #ifndef TOO_FAR
 #  define TOO_FAR 4096
 #endif