diff --git a/ANNOUNCE b/ANNOUNCE
index 8e587af12..1ba93e408 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -41,6 +41,10 @@ Version 1.5.10beta01 [February 24, 2012]
     or put #define PNG_SAFE_LIMITS_SUPPORTED in pnglibconf.h.
 
 Version 1.5.10beta02 [February 24, 2012]
+  Revised pngconf.h to always set the "safe" limits when
+    PNG_SAFE_LIMITS_SUPPORTED is defined, even if pnglibconf.h has
+    been edited to remove the limit definitions.
+  Added information about the new limits in the manual.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 71c665151..dd15809d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3826,6 +3826,10 @@ Version 1.5.10beta01 [February 24, 2012]
     or put #define PNG_SAFE_LIMITS_SUPPORTED in pnglibconf.h.
 
 Version 1.5.10beta02 [February 24, 2012]
+  Revised pngconf.h to always set the "safe" limits when
+    PNG_SAFE_LIMITS_SUPPORTED is defined, even if pnglibconf.h has
+    been edited to remove the limit definitions.
+  Added information about the new limits in the manual.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/libpng-manual.txt b/libpng-manual.txt
index e0af83c6a..1cd8b7424 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -4260,6 +4260,21 @@ PNG_USER_WIDTH_MAX and PNG_USER_HEIGHT_MAX, although this document said
 that it could be used to override them.  Now this function will reduce or
 increase the limits.
 
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS.  If this option is enabled, then
+the limits in pnglibconf.h are ignored and a set of "safe" limits is
+applied in pngconf.h.  These can be overridden by application calls
+to png_set_user_limits(), png_set_user_chunk_cache_max(), and/or
+png_set_user_malloc_max() that increase or decrease the limits.  Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited).  Therefore, the
+limits are now
+                               default      safe
+   png_user_width_max        0x7fffffff    1,000,000
+   png_user_height_max       0x7fffffff    1,000,000
+   png_user_chunk_cache_max  0 (unlimited)   128
+   png_user_chunk_malloc_max 0 (unlimited) 4,000,000
+
 B. Changes to the build and configuration of libpng
 
 Details of internal changes to the library code can be found in the CHANGES
diff --git a/libpng.3 b/libpng.3
index 01ca14424..38c3912cb 100644
--- a/libpng.3
+++ b/libpng.3
@@ -5238,6 +5238,21 @@ PNG_USER_WIDTH_MAX and PNG_USER_HEIGHT_MAX, although this document said
 that it could be used to override them.  Now this function will reduce or
 increase the limits.
 
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS.  If this option is enabled, then
+the limits in pnglibconf.h are ignored and a set of "safe" limits is
+applied in pngconf.h.  These can be overridden by application calls
+to png_set_user_limits(), png_set_user_chunk_cache_max(), and/or
+png_set_user_malloc_max() that increase or decrease the limits.  Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited).  Therefore, the
+limits are now
+                               default      safe
+   png_user_width_max        0x7fffffff    1,000,000
+   png_user_height_max       0x7fffffff    1,000,000
+   png_user_chunk_cache_max  0 (unlimited)   128
+   png_user_chunk_malloc_max 0 (unlimited) 4,000,000
+
 B. Changes to the build and configuration of libpng
 
 Details of internal changes to the library code can be found in the CHANGES