diff --git a/ANNOUNCE b/ANNOUNCE
index 6cf3e4190..2c0f71abe 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -56,6 +56,8 @@ Version 1.6.14beta05 [October 1, 2014]
 
 Version 1.6.14beta06 [October 3, 2014]
   Removed unused "text_len" parameter from private function png_write_zTXt().
+  Conditionally compile some code in png_deflate_claim(), when
+    PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index e2f6d3d27..880da5589 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5009,6 +5009,8 @@ Version 1.6.14beta05 [October 1, 2014]
 
 Version 1.6.14beta06 [October 3, 2014]
   Removed unused "text_len" parameter from private function png_write_zTXt().
+  Conditionally compile some code in png_deflate_claim(), when
+    PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngwutil.c b/pngwutil.c
index 7990a3b52..6bd24a423 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -297,6 +297,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
 {
    if (png_ptr->zowner != 0)
    {
+#     if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
       char msg[64];
 
       PNG_STRING_FROM_CHUNK(msg, owner);
@@ -308,6 +309,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
        * are minimal.
        */
       (void)png_safecat(msg, (sizeof msg), 10, " using zstream");
+#     endif
 #     if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
          png_warning(png_ptr, msg);