diff --git a/ANNOUNCE b/ANNOUNCE
index 66f3a9e7b..c4c76a4ef 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.21beta02 - December 13, 2015
+Libpng 1.6.21beta02 - December 14, 2015
 
 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.
@@ -25,10 +25,16 @@ Other information:
 
 Changes since the last public release (1.6.20):
 
-Version 1.6.21beta01 [December 13, 2015]
+Version 1.6.21beta01 [December 14, 2015]
   Fixed syntax "$(command)" in tests/pngstest that some shells other than
     bash could not parse (Bug report by Nelson Beebe). Use `command` instead.
   Moved png_check_keyword() from pngwutil.c to pngset.c
+  Removed LE/BE dependencies in pngvalid, to 'fix' the current problem
+    in the BigEndian tests by not testing it, making the BE code the same 
+    as the LE version.
+  Fixes to pngvalid for various reduced build configurations (eliminate unused
+    statics) and a fix for the case in rgb_to_gray when the digitize option
+    reduces graylo to 0, producing a large error.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index b684721cf..0f3958586 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5446,10 +5446,16 @@ Version 1.6.20rc02 [November 29, 2015]
 Version 1.6.20 [December 3, 2015]
   No changes.
 
-Version 1.6.21beta01 [December 13, 2015]
+Version 1.6.21beta01 [December 14, 2015]
   Fixed syntax "$(command)" in tests/pngstest that some shells other than
     bash could not parse (Bug report by Nelson Beebe). Use `command` instead.
   Moved png_check_keyword() from pngwutil.c to pngset.c
+  Removed LE/BE dependencies in pngvalid, to 'fix' the current problem
+    in the BigEndian tests by not testing it, making the BE code the same 
+    as the LE version.
+  Fixes to pngvalid for various reduced build configurations (eliminate unused
+    statics) and a fix for the case in rgb_to_gray when the digitize option
+    reduces graylo to 0, producing a large error.
 
 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 be545f4d9..981cd19fa 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -1,7 +1,7 @@
 
 /* pngvalid.c - validate libpng by constructing then reading png files.
  *
- * Last changed in libpng 1.5.25 [%RDATE%]
+ * Last changed in libpng 1.5.25 [(PENDING RELEASE)]
  * Copyright (c) 2014-2015 Glenn Randers-Pehrson
  * Written by John Cunningham Bowler
  *