diff --git a/ANNOUNCE b/ANNOUNCE
index 34dbe0982..423560a88 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.23beta01 - March 27, 2015
+Libpng 1.5.23beta01 - April 29, 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.
@@ -27,9 +27,11 @@ Other information:
 
 Changes since the last public release (1.5.22):
 
-Version 1.5.23beta01 [March 27, 2015]
+Version 1.5.23beta01 [April 29, 2015]
   Removed unused PNG_SET_CHUNK_[CACHE|MALLOC]_LIMIT_SUPPORTED definitions
     from pnglibconf.h.prebuilt (Andrew Church).
+  Replaced "unexpected" with an integer in pngset.c where a long was
+    expected, to avoid a compiler warning when PNG_DEBUG > 1.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index c983a47c9..7af077870 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4334,9 +4334,11 @@ Version 1.5.22rc04 [March 16, 2015]
 Version 1.5.22 [March 26, 2015]
   No changes.
 
-Version 1.5.23beta01 [March 27, 2015]
+Version 1.5.23beta01 [April 29, 2015]
   Removed unused PNG_SET_CHUNK_[CACHE|MALLOC]_LIMIT_SUPPORTED definitions
     from pnglibconf.h.prebuilt (Andrew Church).
+  Replaced "unexpected" with an integer in pngset.c where a long was
+    expected, to avoid a compiler warning when PNG_DEBUG > 1.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngset.c b/pngset.c
index cf1eb0fc0..ef8fb6551 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.5.22 [March 26, 2015]
+ * Last changed in libpng 1.5.23 [(PENDING RELEASE)]
  * Copyright (c) 1998-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -673,7 +673,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
    int i;
    size_t element_size;
 
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :
+  png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11 :
       (unsigned long)png_ptr->chunk_name);
 
    if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index aa2b6b545..287b50236 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -1,7 +1,7 @@
 /* 1.5.23beta01 STANDARD API DEFINITION */
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.23beta01 - March 27, 2015 */
+/* libpng version 1.5.23beta01 - April 29, 2015 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */