diff --git a/ANNOUNCE b/ANNOUNCE
index ee0be7caa..f1e472e5f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -31,6 +31,8 @@ Changes since the last public release (1.6.26):
     substitution of an expression itself containing a well-formed defined
     operation.
   Added ARM support to CMakeLists.txt (Andreas Franek).
+  Fixed a potential null pointer dereference in png_set_text_2() (bug report
+    and patch by Patrick Keshishian).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 4b442b7fd..180084c87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5771,6 +5771,8 @@ Version 1.6.27rc01 [December 27, 2016]
   Added ARM support to CMakeLists.txt (Andreas Franek).
 
 Version 1.6.27 [December 29, 2016]
+  Fixed a potential null pointer dereference in png_set_text_2() (bug report
+    and patch by Patrick Keshishian)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.c b/png.c
index 8afc28fc2..2e05de159 100644
--- a/png.c
+++ b/png.c
@@ -477,6 +477,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
          png_free(png_ptr, info_ptr->text);
          info_ptr->text = NULL;
          info_ptr->num_text = 0;
+         info_ptr->max_text = 0;
       }
    }
 #endif