diff --git a/ANNOUNCE b/ANNOUNCE
index 283d60c4f..37031e3b3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta84 - September 1, 2016
+Libpng 1.7.0beta84 - September 12, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -1396,11 +1396,12 @@ Version 1.7.0beta83 [July 23, 2016]
     in reading.
   Fixed debug test of output gamma.
 
-Version 1.7.0beta84 [September 1, 2016]
+Version 1.7.0beta84 [September 12, 2016]
   Minor editing of INSTALL, (whitespace, added copyright line)
   Don't install pngcp; it conflicts with pngcp in the pngtools package.
   Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
     bugfix by John Bowler).
+  Conditionally compile png_set_benign_errors() in pngread.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index e8a3ddbd0..8cec28044 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5696,11 +5696,12 @@ Version 1.7.0beta83 [July 23, 2016]
     in reading.
   Fixed debug test of output gamma.
 
-Version 1.7.0beta84 [September 1, 2016]
+Version 1.7.0beta84 [September 12, 2016]
   Minor editing of INSTALL, (whitespace, added copyright line)
   Don't install pngcp; it conflicts with pngcp in the pngtools package.
   Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
     bugfix by John Bowler).
+  Conditionally compile png_set_benign_errors() in pngread.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngread.c b/pngread.c
index 993877233..96a5a1b4b 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1131,7 +1131,9 @@ png_image_read_header(png_voidp argument)
    png_structrp png_ptr = image->opaque->png_ptr;
    png_inforp info_ptr = image->opaque->info_ptr;
 
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
    png_set_benign_errors(png_ptr, 1/*warn*/);
+#endif
    png_read_info(png_ptr, info_ptr);
 
    /* Do this the fast way; just read directly out of png_struct. */