diff --git a/ANNOUNCE b/ANNOUNCE
index b6caf9c84..416db10a3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -477,6 +477,9 @@ Version 1.7.0beta26 [December 29, 2013]
   Fixed test programs for interlace options. Made pngvalid.c and
     pngtest.c work correctly when READ_INTERLACING and/or WRITE_INTERLACING
     are switched off.
+  Changed pngvalid.c to support libpng 1.5, which does not support
+    the PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when
+    appropriate in pngvalid.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 83111505f..fcc9d5c23 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4766,6 +4766,9 @@ Version 1.7.0beta26 [December 29, 2013]
   Fixed test programs for interlace options. Made pngvalid.c and
     pngtest.c work correctly when READ_INTERLACING and/or WRITE_INTERLACING
     are switched off.
+  Changed pngvalid.c to support libpng 1.5, which does not support
+    the PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when
+    appropriate in pngvalid.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index 080031dcb..671734076 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -10339,10 +10339,12 @@ int main(int argc, char **argv)
 
          else
 #endif
+#ifdef PNG_MAXIMUM_INFLATE_WINDOW
          if (strncmp(arg, "max-inflate-window:", 19) == 0)
             option = PNG_MAXIMUM_INFLATE_WINDOW, arg += 19;
 
          else
+#endif
          {
             fprintf(stderr, "pngvalid: %s: %s: unknown option\n", *argv, arg);
             exit(99);