diff --git a/ANNOUNCE b/ANNOUNCE
index 1b3008d46..0ce76cc04 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta06 - January 16, 2012
+Libpng 1.6.0beta06 - January 24, 2012
 
 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.
@@ -109,10 +109,11 @@ Version 1.6.0beta05 [January 15, 2012]
   Fix bug in pngerror.c: some long warnings were being improperly truncated
     (bug introduced in libpng-1.5.3beta05).
 
-Version 1.6.0beta06 [January 16, 2012]
-  Add palette support to the simplified APIs. This commit
+Version 1.6.0beta06 [January 24, 2012]
+  Added palette support to the simplified APIs. This commit
     changes some of the macro definitions in png.h, app code
     may need corresponding changes.
+  Increased the formatted warning buffer to 192 bytes.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 1a81df286..0ceb4039b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3860,10 +3860,11 @@ Version 1.6.0beta05 [January 15, 2012]
   Fix bug in pngerror.c: some long warnings were being improperly truncated
     (bug introduced in libpng-1.5.3beta05).
 
-Version 1.6.0beta06 [January 16, 2012]
-  Add palette support to the simplified APIs. This commit
+Version 1.6.0beta06 [January 24, 2012]
+  Added palette support to the simplified APIs. This commit
     changes some of the macro definitions in png.h, app code
     may need corresponding changes.
+  Increased the formatted warning buffer to 192 bytes.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngerror.c b/pngerror.c
index f9861f6e4..631b80e6a 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -283,11 +283,13 @@ void
 png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
    png_const_charp message)
 {
-   /* The internal buffer is just 128 bytes - enough for all our messages,
-    * overflow doesn't happen because this code checks!
+   /* The internal buffer is just 192 bytes - enough for all our messages,
+    * overflow doesn't happen because this code checks!  If someone figures
+    * out how to send us a message longer than 192 bytes, all that will
+    * happen is that the message will be truncated appropriately.
     */
    size_t i = 0; /* Index in the msg[] buffer: */
-   char msg[128];
+   char msg[192];
 
    /* Each iteration through the following loop writes at most one character
     * to msg[i++] then returns here to validate that there is still space for