diff --git a/ANNOUNCE b/ANNOUNCE
index 7b3a5a426..868089ff4 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.8beta01 - November 17, 2013
+Libpng 1.6.8beta01 - November 18, 2013
 
 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,8 +26,12 @@ Other information:
 
 Changes since the last public release (1.6.7):
 
-Version 1.6.8beta01 [November 17, 2013]
-  Added #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpread.c
+Version 1.6.8beta01 [November 18, 2013]
+  Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to
+    #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with
+    what is in pngpriv.h.
+  Moved prototype for png_handle_unknown() in pngpriv.h outside of
+    the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 0d6e84ca6..ad438b31e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4713,8 +4713,12 @@ Version 1.6.7rc02 [November 7, 2013]
 
 Version 1.6.7 [November 14, 2013]
 
-Version 1.6.8beta01 [November 17, 2013]
-  Added #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpread.c
+Version 1.6.8beta01 [November 18, 2013]
+  Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to
+    #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with
+    what is in pngpriv.h.
+  Moved prototype for png_handle_unknown() in pngpriv.h outside of
+    the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpread.c b/pngpread.c
index 6ccfae4d3..df94676d3 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -537,10 +537,8 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
          png_push_save_buffer(png_ptr);
          return;
       }
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
       png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
          PNG_HANDLE_CHUNK_AS_DEFAULT);
-#endif
    }
 
    png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
diff --git a/pngpriv.h b/pngpriv.h
index 43b2ef4c5..dd1740a9f 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1464,7 +1464,6 @@ PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
 PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr,
     png_uint_32 chunk_name),PNG_EMPTY);
 
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
     png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
    /* This is the function that gets called for unknown chunks.  The 'keep'
@@ -1473,6 +1472,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
     * just skips the chunk or errors out if it is critical.
     */
 
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
 PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,