diff --git a/ANNOUNCE b/ANNOUNCE
index 7520028b1..a43ff0fac 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -32,7 +32,8 @@ Version 1.5.11 [April 24, 2012]
     to shared library link; don't try to create a shared lib based on missing
     RELEASE variable.
   Enable png_set_check_for_invalid_index() for both read and write.
-  Fixed problem with use of PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c
+  Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
+    declaration of png_handle_unknown().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index d1ff7a257..7f4695835 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3860,7 +3860,8 @@ Version 1.5.11 [April 24, 2012]
     to shared library link; don't try to create a shared lib based on missing
     RELEASE variable.
   Enable png_set_check_for_invalid_index() for both read and write.
-  Fixed problem with use of PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c
+  Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
+    declaration of png_handle_unknown().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpread.c b/pngpread.c
index f36197e91..46988881f 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -255,11 +255,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
       png_push_have_end(png_ptr, info_ptr);
    }
 
-#ifdef PNG_HANDLE_UNKNOWN_SUPPORTED
-   else
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   if (png_chunk_unknown_handling(png_ptr, chunk_name))
-#endif
+   else if (png_chunk_unknown_handling(png_ptr, chunk_name))
    {
       if (png_ptr->push_length + 4 > png_ptr->buffer_size)
       {
@@ -285,8 +282,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
             png_error(png_ptr, "Missing PLTE before IDAT");
       }
    }
-
 #endif
+
    else if (chunk_name == png_PLTE)
    {
       if (png_ptr->push_length + 4 > png_ptr->buffer_size)
@@ -554,7 +551,6 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 
 #endif
 
-#ifdef PNG_HANDLE_UNKNOWN_SUPPORTED
    else
    {
       if (png_ptr->push_length + 4 > png_ptr->buffer_size)
@@ -564,7 +560,6 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
       }
       png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
    }
-#endif
 
    png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
 }
diff --git a/pngpriv.h b/pngpriv.h
index 0ceb6b85a..8b2a1749f 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1259,10 +1259,8 @@ PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
     png_uint_32 length));
 #endif
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
     png_infop info_ptr, png_uint_32 length));
-#endif
 
 PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
     png_uint_32 chunk_name));