diff --git a/ANNOUNCE b/ANNOUNCE
index 647342693..4539b30c6 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.0alpha01 - December 22, 2009
+Libpng 1.5.0alpha01 - December 25, 2009
 
 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.
@@ -55,12 +55,14 @@ version 1.4.1alpha02 [December 11, 2009]
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
-version 1.5.0alpha01 [December 22, 2009]
+version 1.5.0alpha01 [December 25, 2009]
   Bump version to 1.5.0alpha01
   Add "depth" parameter to private png_build_gamma_table()
   Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
   Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
     (revising the change in 1.4.0beta99)
+  Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+    in pngset.c to be consistent with other changes in version 1.2.38.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index a519ece6d..a3517e754 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2437,12 +2437,14 @@ version 1.4.1alpha02 [December 11, 2009]
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
-version 1.5.0alpha01 [December 22, 2009]
+version 1.5.0alpha01 [December 25, 2009]
   Bump version to 1.5.0alpha01
   Add "depth" parameter to private png_build_gamma_table()
   Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
   Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
     (revising the change in 1.4.0beta99)
+  Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+    in pngset.c to be consistent with other changes in version 1.2.38.
 
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/pngset.c b/pngset.c
index 47d05d3f4..255dbe712 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.4.0 [December 12, 2009]
+ * Last changed in libpng 1.5.0 [December 25, 2009]
  * Copyright (c) 1998-2009 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.)
@@ -932,7 +932,7 @@ png_set_sPLT(png_structp png_ptr,
 }
 #endif /* PNG_sPLT_SUPPORTED */
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 void PNGAPI
 png_set_unknown_chunks(png_structp png_ptr,
    png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
@@ -1016,7 +1016,7 @@ png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
 }
 #endif
 
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 void PNGAPI
 png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
    chunk_list, int num_chunks)