diff --git a/ANNOUNCE b/ANNOUNCE
index bb72cc825..b31a3df68 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0rc03 - December 22, 2009
+Libpng 1.4.0rc04 - 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.4.0rc03.tar.xz (LZMA-compressed, recommended)
-   1.4.0rc03.tar.gz
-   1.4.0rc03.tar.bz2
+   1.4.0rc04.tar.xz (LZMA-compressed, recommended)
+   1.4.0rc04.tar.gz
+   1.4.0rc04.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp140r03.zip
-   lp140r03.7z
+   lp140r04.zip
+   lp140r04.7z
 
 Other information:
 
-   1.4.0rc03-README.txt
-   1.4.0rc03-LICENSE.txt
+   1.4.0rc04-README.txt
+   1.4.0rc04-LICENSE.txt
 
 Changes since the last public release (1.2.10):
 
@@ -740,13 +740,20 @@ version 1.4.0beta109 [December 13, 2009]
     PNG_16_TO_8 transform has been set, to avoid unnecessary build of 16-bit
     tables.
 
-version 1.4.0rc02 [December 22, 2009]
+version 1.4.0rc02 [December 20, 2009]
   Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
 
 version 1.4.0rc03 [December 22, 2009]
   Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
     (revising the change in 1.4.0beta99)
 
+version 1.4.0rc04 [December 25, 2009]
+  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.
+
+version 1.4.0 [December 25, 2009]
+  No changes.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 87be5c6b8..7779071f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2427,13 +2427,20 @@ version 1.4.0beta109 [December 13, 2009]
     PNG_16_TO_8 transform has been set, to avoid unnecessary build of 16-bit
     tables.
 
-version 1.4.0rc02 [December 22, 2009]
+version 1.4.0rc02 [December 20, 2009]
   Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c
 
 version 1.4.0rc03 [December 22, 2009]
   Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
     (revising the change in 1.4.0beta99)
 
+version 1.4.0rc04 [December 25, 2009]
+  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.
+
+version 1.4.0 [December 25, 2009]
+  No changes.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/pngset.c b/pngset.c
index 737bf3684..b9981f057 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 22, 2009]
+ * Last changed in libpng 1.4.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)