diff --git a/ANNOUNCE b/ANNOUNCE
index b141aa7..34bc017 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.8beta01 - December 16, 2011
+Libpng 1.5.8beta01 - December 21, 2011
 
 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.
@@ -26,7 +26,7 @@
 
 Changes since the last public release (1.5.7):
 
-Version 1.5.8 [December 16, 2011]
+Version 1.5.8beta01 [December 21, 2011]
   Removed '#include config.h"' from contrib/libtests/pngvalid.c.  It's not
     needed and causes trouble for VPATH building.
 
diff --git a/CHANGES b/CHANGES
index e155020..35df4ce 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3776,7 +3776,7 @@
   Minor fixes to pngvalid.c for gcc 4.6.2 compatibility to remove warnings
     reported by earlier versions.
 
-Version 1.5.8 [December 16, 2011]
+Version 1.5.8beta01 [December 21, 2011]
   Removed '#include config.h"' from contrib/libtests/pngvalid.c.  It's not
     needed and causes trouble for VPATH building.
 
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index ae13792..af586f5 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.7 [%RDATE%]
+ * Last changed in libpng 1.5.8 [%RDATE%]
  * Copyright (c) 2011 Glenn Randers-Pehrson
  * Written by John Cunningham Bowler
  *
@@ -29,7 +29,14 @@
 #  include <fenv.h>
 #endif
 
-#include "../../png.h"
+/* Define the following to use this test against your installed libpng, rather
+ * than the one being built here:
+ */
+#ifdef PNG_FREESTANDING_TESTS
+#  include <png.h>
+#else
+#  include "../../png.h"
+#endif
 
 #if PNG_LIBPNG_VER < 10500
 /* This deliberately lacks the PNG_CONST. */
diff --git a/scripts/def.dfn b/scripts/def.dfn
index 5fd7525..f991863 100644
--- a/scripts/def.dfn
+++ b/scripts/def.dfn
@@ -1,6 +1,6 @@
 /* def.dfn - define format of libpng.def
  *
- * Last changed in libpng version 1.5.0 [(PENDING RELEASE)]
+ * Last changed in libpng version 1.5.7 [December 15, 2011]
  * Copyright (c) 2010-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.