diff --git a/ANNOUNCE b/ANNOUNCE
index fe77f8b..b730960 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.25beta02 - August 17, 2016
+Libpng 1.6.25beta02 - August 18, 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.
@@ -30,7 +30,7 @@
   Cleaned up PNG_DEBUG compile of pngtest.c.
   Conditionally compile png_inflate().
 
-Version 1.6.25beta02 [August 17, 2016]
+Version 1.6.25beta02 [August 18, 2016]
   Don't install pngcp; it conflicts with pngcp in the pngtools package.
   Minor editing of INSTALL, (whitespace, added copyright line)
 
diff --git a/CHANGES b/CHANGES
index 0721aae..4371cdc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5680,7 +5680,7 @@
   Cleaned up PNG_DEBUG compile of pngtest.c.
   Conditionally compile png_inflate().
 
-Version 1.6.25beta02 [August 17, 2016]
+Version 1.6.25beta02 [August 18, 2016]
   Don't install pngcp; it conflicts with pngcp in the pngtools package.
   Minor editing of INSTALL, (whitespace, added copyright line)
 
diff --git a/LICENSE b/LICENSE
index 5db8350..fba2d43 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -127,4 +127,4 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-August 12, 2016
+August 18, 2016
diff --git a/README b/README
index 7974472..b0f966c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.25beta02 - August 12, 2016 (shared library 16.0)
+README for libpng version 1.6.25beta02 - August 18, 2016 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
diff --git a/TODO b/TODO
index 0b3b651..cdb9e1f 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,9 @@
 Better C++ wrapper/full C++ implementation?
 Fix problem with C++ and EXTERN "C".
 cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes.
+Remove setjmp/longjmp usage in favor of returning error codes. As a start on
+  this, minimize the use of png_error(), replacing them with
+  png_warning(); return(0; or similar.
 Palette creation.
 Add "grayscale->palette" transformation and "palette->grayscale" detection.
 Improved dithering.
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 887c9bf..3cf0cec 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.25beta02 - August 12, 2016
+ libpng version 1.6.25beta02 - August 18, 2016
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.25beta02 - August 12, 2016
+ libpng versions 0.97, January 1998, through 1.6.25beta02 - August 18, 2016
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
 
diff --git a/libpng.3 b/libpng.3
index bfb3f3b..ebbf242 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "August 12, 2016"
+.TH LIBPNG 3 "August 18, 2016"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta02
 .SH SYNOPSIS
@@ -510,7 +510,7 @@
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.25beta02 - August 12, 2016
+ libpng version 1.6.25beta02 - August 18, 2016
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.25beta02 - August 12, 2016
+ libpng versions 0.97, January 1998, through 1.6.25beta02 - August 18, 2016
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
 
@@ -6018,7 +6018,7 @@
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.25beta02 - August 12, 2016:
+Libpng version 1.6.25beta02 - August 18, 2016:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6043,7 +6043,7 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6168,7 +6168,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-August 12, 2016
+August 18, 2016
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 3e43089..f101c46 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "August 12, 2016"
+.TH LIBPNGPF 3 "August 18, 2016"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta02
 (private functions)
diff --git a/png.5 b/png.5
index 498c98e..a6fa026 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "August 12, 2016"
+.TH PNG 5 "August 18, 2016"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 47e6512..d2466aa 100644
--- a/png.c
+++ b/png.c
@@ -775,14 +775,14 @@
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.25beta02 - August 12, 2016" PNG_STRING_NEWLINE \
+      "libpng version 1.6.25beta02 - August 18, 2016" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
       "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
       PNG_STRING_NEWLINE;
 #  else
-   return "libpng version 1.6.25beta02 - August 12, 2016\
+   return "libpng version 1.6.25beta02 - August 18, 2016\
       Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index b5db364..96c9f78 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.25beta02, August 12, 2016
+ * libpng version 1.6.25beta02, August 18, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.25beta02, August 12, 2016:
+ *   libpng versions 0.97, January 1998, through 1.6.25beta02, August 18, 2016:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -29,7 +29,7 @@
  * files that are distributed with libpng have other copyright owners and
  * are released under other open source licenses.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 2016 are
  * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -245,7 +245,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    August 12, 2016
+ *    August 18, 2016
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -314,7 +314,7 @@
 
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.25beta02"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25beta02 - August 12, 2016\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25beta02 - August 18, 2016\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
diff --git a/pngconf.h b/pngconf.h
index 7b32af3..171fbf4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.25beta02, August 12, 2016
+ * libpng version 1.6.25beta02, August 18, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt
index b30c0e5..49d6aca 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.25beta02 - August 12, 2016
+libpng version 1.6.25beta02 - August 18, 2016
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e6b462d..7a88a5d 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.25beta02 - August 12, 2016
+ * libpng version 1.6.25beta02 - August 18, 2016
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index 399c5a3..6a16efa 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.6.25beta02 - August 12, 2016
+Makefiles for  libpng version 1.6.25beta02 - August 18, 2016
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 006b29f..0263029 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.25beta02 - August 12, 2016 */
+/* Libpng version 1.6.25beta02 - August 18, 2016 */
 
 /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */