diff --git a/ANNOUNCE b/ANNOUNCE
index 701cb70..963f9e7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.30beta04 - June 6, 2017
+Libpng 1.6.30beta04 - June 7, 2017
 
 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.
@@ -45,7 +45,7 @@
   Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt.
   Fix some URL in documentation.
 
-Version 1.6.30beta04 [June 6, 2017]
+Version 1.6.30beta04 [June 7, 2017]
   Avoid writing an empty IDAT when the last IDAT exactly fills the
     compression buffer (bug report by Brian Baird).  This bug was
     introduced in libpng-1.6.0.
diff --git a/CHANGES b/CHANGES
index 649f00e..52046bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5840,7 +5840,7 @@
   Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt.
   Fix some URL in documentation.
 
-Version 1.6.30beta04 [June 6, 2017]
+Version 1.6.30beta04 [June 7, 2017]
   Avoid writing an empty IDAT when the last IDAT exactly fills the
     compression buffer (bug report by Brian Baird).  This bug was
     introduced in libpng-1.6.0.
diff --git a/LICENSE b/LICENSE
index 1e611ce..0dcd514 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 22, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, June 7, 2017 are
 Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -130,4 +130,4 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 22, 2017
+June 7, 2017
diff --git a/README b/README
index 8da5163..3cb5423 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.30beta04 - May 22, 2017 (shared library 16.0)
+README for libpng version 1.6.30beta04 - June 7, 2017 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -23,7 +23,7 @@
 png_uint_32, which will affect shared-library applications that use
 this function.
 
-To avoid problems with changes to the internals of png info_struct,
+To avoid problems with changes to the internals of the png info_struct,
 new APIs have been made available in 0.95 to avoid direct application
 access to info_ptr.  These functions are the png_set_<chunk> and
 png_get_<chunk> functions.  These functions should be used when
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 5adb084..cfa2f4c 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.30beta04 - May 27, 2017
+ libpng version 1.6.30beta04 - June 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.30beta04 - May 27, 2017
+ libpng versions 0.97, January 1998, through 1.6.30beta04 - June 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
diff --git a/libpng.3 b/libpng.3
index 4ec40bf..52b675e 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "May 27, 2017"
+.TH LIBPNG 3 "June 7, 2017"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta04
 .SH SYNOPSIS
@@ -510,7 +510,7 @@
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.30beta04 - May 27, 2017
+ libpng version 1.6.30beta04 - June 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.30beta04 - May 27, 2017
+ libpng versions 0.97, January 1998, through 1.6.30beta04 - June 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
@@ -6051,7 +6051,7 @@
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.30beta04 - May 27, 2017:
+Libpng version 1.6.30beta04 - June 7, 2017:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6076,7 +6076,7 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 27, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, June 7, 2017 are
 Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6204,7 +6204,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 27, 2017
+June 7, 2017
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 5e71388..834a9a3 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "May 22, 2017"
+.TH LIBPNGPF 3 "June 7, 2017"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.30beta04
 (private functions)
diff --git a/png.5 b/png.5
index 6ad9c00..d6dbc10 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "May 22, 2017"
+.TH PNG 5 "June 7, 2017"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 2e96dd7..fbd32c9 100644
--- a/png.c
+++ b/png.c
@@ -776,14 +776,14 @@
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.30beta04 - May 22, 2017" PNG_STRING_NEWLINE \
+      "libpng version 1.6.30beta04 - June 7, 2017" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
       "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
       PNG_STRING_NEWLINE;
 #  else
-   return "libpng version 1.6.30beta04 - May 22, 2017\
+   return "libpng version 1.6.30beta04 - June 7, 2017\
       Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index a14141e..47ed442 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.30beta04, May 22, 2017
+ * libpng version 1.6.30beta04, June 7, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.30beta04, May 22, 2017:
+ *   libpng versions 0.97, January 1998, through 1.6.30beta04, June 7, 2017:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -25,7 +25,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, May 22, 2017 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.30beta04, June 7, 2017 are
  * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -241,7 +241,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    May 22, 2017
+ *    June 7, 2017
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -310,7 +310,7 @@
 
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.30beta04"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30beta04 - May 22, 2017\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.30beta04 - June 7, 2017\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
diff --git a/pngconf.h b/pngconf.h
index da798fc..a50d413 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.30beta04, May 22, 2017
+ * libpng version 1.6.30beta04, June 7, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 21cfcf4..dd80058 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1003,7 +1003,7 @@
                optimize_cmf(data, png_image_size(png_ptr));
 #endif
 
-         if (size)
+         if (size > 0)
             png_write_complete_chunk(png_ptr, png_IDAT, data, size);
          png_ptr->mode |= PNG_HAVE_IDAT;
 
@@ -1050,7 +1050,7 @@
             optimize_cmf(data, png_image_size(png_ptr));
 #endif
 
-         if (size)
+         if (size > 0)
             png_write_complete_chunk(png_ptr, png_IDAT, data, size);
          png_ptr->zstream.avail_out = 0;
          png_ptr->zstream.next_out = NULL;
diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt
index 57c09dc..1136604 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.30beta04 - May 22, 2017
+libpng version 1.6.30beta04 - June 7, 2017
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 9248207..82e3bfb 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.30beta04 - May 22, 2017
+ * libpng version 1.6.30beta04 - June 7, 2017
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index 06e2cea..e0fd3b7 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.6.30beta04 - May 22, 2017
+Makefiles for  libpng version 1.6.30beta04 - June 7, 2017
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 0cf3256..eda91f1 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.30beta04 - May 22, 2017 */
+/* Libpng version 1.6.30beta04 - June 7, 2017 */
 
 /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */