diff --git a/ANNOUNCE b/ANNOUNCE
index 6e34be64..053755f5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.38beta01 - June 12, 2009
+Libpng 1.2.38beta01 - June 16, 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.
@@ -78,13 +78,16 @@ versions 1.2.37 and 1.0.45 [June 4, 2009]
   Added a section in the documentation about using png_get_io_ptr() in
     configure scripts to detect the presence of libpng.
 
-version 1.2.38beta01 [June 12, 2009]
+version 1.2.38beta01 [June 16, 2009]
   Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR()
     multiple times and to specify the sample order in the tRNS chunk,
     because the ISO PNG specification has a typo in the tRNS table.
   Changed several PNG_UNKNOWN_CHUNK_SUPPORTED to
     PNG_HANDLE_AS_UNKNOWN_SUPPORTED, to make the png_set_keep mechanism
     available for ignoring known chunks even when not saving unknown chunks.
+  Added PNG_NO_HANDLE_AS_UNKNOWN in the PNG_LEGACY_SUPPORTED block of
+    pngconf.h, and moved the various unknown chunk macro definitions
+    outside of the PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index 11e5101e..158b37f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2403,13 +2403,18 @@ versions 1.2.37 and 1.0.45 [June 4, 2009]
   Added a section to the libpng documentation about using png_get_io_ptr()
     in configure scripts to detect the presence of libpng.
 
-versions 1.2.38beta01 [June 12, 2009]
+versions 1.2.38beta01 [June 16, 2009]
   Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR()
     multiple times and to specify the sample order in the tRNS chunk,
     because the ISO PNG specification has a typo in the tRNS table.
   Changed several PNG_UNKNOWN_CHUNK_SUPPORTED to
     PNG_HANDLE_AS_UNKNOWN_SUPPORTED, to make the png_set_keep mechanism
     available for ignoring known chunks even when not saving unknown chunks.
+  Adopted preference for consistent use of "#ifdef" and "#ifndef" versus
+    "#if defined()" and "if !defined()" where possible.
+  Added PNG_NO_HANDLE_AS_UNKNOWN in the PNG_LEGACY_SUPPORTED block of
+    pngconf.h, and moved the various unknown chunk macro definitions
+    outside of the PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index 6d354f70..c0905fc2 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -969,6 +969,7 @@
 #    undef PNG_NO_HANDLE_AS_UNKNOWN
 #  endif
 #endif
+
 #ifndef PNG_NO_HANDLE_AS_UNKNOWN
 #  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
@@ -1102,6 +1103,7 @@
 #    define PNG_UNKNOWN_CHUNKS_SUPPORTED
 #  endif
 #endif
+
 #ifndef PNG_NO_HANDLE_AS_UNKNOWN
 #  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED