diff --git a/ANNOUNCE b/ANNOUNCE
index 8ac8b3a1b..36b801bb2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta03 - February 19, 2016
+Libpng 1.6.22beta03 - February 27, 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.
@@ -54,7 +54,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 19, 2016]
+Version 1.6.22beta03 [February 27, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -68,6 +68,13 @@ Version 1.6.22beta03 [February 19, 2016]
     necessarily under the libpng license, and that some makefiles have
     other copyright owners.
   Added INTEL-SSE2 support (Mike Klein and Matt Sarett, Google, Inc.).
+  Made contrib/libtests/timepng more robust.  The code no longer gives
+    up/fails on invalid PNG data, it just skips it (with error messages).
+    The code no longer fails on PNG files with data beyond IEND.  Options
+    exist to use png_read_png (reading the whole image, not by row) and, in
+    that case, to apply any of the supported transforms.  This makes for
+    more realistic testing; the decoded data actually gets used in a
+    meaningful fashion (John Bowler).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 3bf817905..a6044d8f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5513,7 +5513,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 19, 2016]
+Version 1.6.22beta03 [February 27, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -5527,6 +5527,13 @@ Version 1.6.22beta03 [February 19, 2016]
     necessarily under the libpng license, and that some makefiles have
     other copyright owners.
   Added INTEL-SSE2 support (Mike Klein and Matt Sarett, Google, Inc.).
+  Made contrib/libtests/timepng more robust.  The code no longer gives
+    up/fails on invalid PNG data, it just skips it (with error messages).
+    The code no longer fails on PNG files with data beyond IEND.  Options
+    exist to use png_read_png (reading the whole image, not by row) and, in
+    that case, to apply any of the supported transforms.  This makes for
+    more realistic testing; the decoded data actually gets used in a
+    meaningful fashion (John Bowler).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/libtests/timepng.c b/contrib/libtests/timepng.c
index 200082604..9ad18ae8e 100644
--- a/contrib/libtests/timepng.c
+++ b/contrib/libtests/timepng.c
@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2013,2016 John Cunningham Bowler
  *
- * Last changed in libpng 1.6.22 [February 25, 2016]
+ * Last changed in libpng 1.6.22 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer