diff --git a/ANNOUNCE b/ANNOUNCE
index b972cd500103486b95b848e88c7948b6a14e8819..a204b95d0b03de3d1cf315e818c774383b365c11 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.20beta02 - November 22, 2015
+Libpng 1.6.20beta02 - November 23, 2015
 
 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.
@@ -30,6 +30,8 @@ Version 1.6.20beta01 [November 20, 2015]
     png_handle_pCAL() (Bug report by John Regehr).
 
 Version 1.6.20beta02 [(PENDING RELEASE)]
+  Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
+    not info_ptr.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 5cea6cfdddb93c701bc87060783972c743c58fe8..1466e50a07e19f4a1f32dfe68bdec845a59f2392 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5419,6 +5419,8 @@ Version 1.6.20beta01 [November 20, 2015]
     png_handle_pCAL() (Bug report by John Regehr).
 
 Version 1.6.20beta02 [(PENDING RELEASE)]
+  Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
+    not info_ptr.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngset.c b/pngset.c
index ca82b840068363140b118503446afbce5a4ff2ec..8fd7965fca5fac2dfa5cca4ea38e89536bb8b029 100644
--- a/pngset.c
+++ b/pngset.c
@@ -520,8 +520,8 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   max_palette_length = (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
-      (1 << png_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
+   max_palette_length = (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
+      (1 << info_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
 
    if (num_palette < 0 || num_palette > (int) max_palette_length)
    {