diff --git a/libpng-manual.txt b/libpng-manual.txt
index f055ddb..531bd51 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -4619,7 +4619,8 @@
     "png_uint_16 year" in png_time_struct.
 
 The string is
-    "png_charp time_buffer" in png_struct
+    "char time_buffer[29]" in png_struct.  This will no
+longer be used in libpng-1.6.x and will be removed from libpng-1.7.0.
 
 There are seven time-related functions:
 
diff --git a/libpng.3 b/libpng.3
index 06d42e8..a42395e 100644
--- a/libpng.3
+++ b/libpng.3
@@ -5601,7 +5601,8 @@
     "png_uint_16 year" in png_time_struct.
 
 The string is
-    "png_charp time_buffer" in png_struct
+    "char time_buffer[29]" in png_struct.  This will no
+longer be used in libpng-1.6.x and will be removed from libpng-1.7.0.
 
 There are seven time-related functions:
 
diff --git a/png.h b/png.h
index 800f634..b8bc16d 100644
--- a/png.h
+++ b/png.h
@@ -336,8 +336,8 @@
  *        "png_uint_16 year" in png_time_struct.
  *
  *    The string is
- *        "char time_buffer[29]" in png_struct.  This is no
- *    longer used and will be removed from libpng-1.7.0.
+ *        "char time_buffer[29]" in png_struct.  This will be no
+ *    longer used in libpng-1.6.0 and will be removed from libpng-1.7.0.
  *
  *    There are seven time-related functions:
  *        png.c: png_convert_to_rfc_1123() in png.c
diff --git a/pngstruct.h b/pngstruct.h
index bad7b95..db0d4e4 100644
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -248,6 +248,7 @@
 #endif
 
 #ifdef PNG_TIME_RFC1123_SUPPORTED
+   /* This is going to be unused in libpng16 and removed from libpng17 */
    char time_buffer[29]; /* String to hold RFC 1123 time text */
 #endif