diff --git a/ANNOUNCE b/ANNOUNCE
index 3313b34f2d194cfc0eb35a448a8ae46f41e7db4c..e1cd436c076c9c1a4865d71beba342a8c00e5157 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.30rc05 - July 25, 2008
+Libpng 1.2.30rc06 - July 30, 2008
 
 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.
@@ -9,37 +9,37 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.2.30rc05.tar.gz
-   libpng-1.2.30rc05.tar.lzma
+   libpng-1.2.30rc06.tar.gz
+   libpng-1.2.30rc06.tar.lzma
      (Get the lzma codec from <http://tukaani.org/lzma>).
-   libpng-1.2.30rc05.tar.bz2
+   libpng-1.2.30rc06.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   libpng-1.2.30rc05-no-config.tar.gz
-   libpng-1.2.30rc05-no-config.tar.lzma
-   libpng-1.2.30rc05-no-config.tar.bz2
+   libpng-1.2.30rc06-no-config.tar.gz
+   libpng-1.2.30rc06-no-config.tar.lzma
+   libpng-1.2.30rc06-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1230r05.zip
-   lp1230r05.7z
-   lp1230r05.tar.bz2
+   lp1230r06.zip
+   lp1230r06.7z
+   lp1230r06.tar.bz2
 
 Project files
 
-   libpng-1.2.30rc05-project-netware.zip
-   libpng-1.2.30rc05-project-wince.zip
+   libpng-1.2.30rc06-project-netware.zip
+   libpng-1.2.30rc06-project-wince.zip
 
 Other information:
 
-   libpng-1.2.30rc05-README.txt
-   libpng-1.2.30rc05-KNOWNBUGS.txt
-   libpng-1.2.30rc05-LICENSE.txt
-   libpng-1.2.30rc05-Y2K-compliance.txt
-   libpng-1.2.30rc05-[previous version]-diff.txt
+   libpng-1.2.30rc06-README.txt
+   libpng-1.2.30rc06-KNOWNBUGS.txt
+   libpng-1.2.30rc06-LICENSE.txt
+   libpng-1.2.30rc06-Y2K-compliance.txt
+   libpng-1.2.30rc06-[previous version]-diff.txt
 
 Changes since the last public release (1.2.29):
 
@@ -85,7 +85,7 @@ version 1.2.30beta03 [July 6, 2008]
 version 1.2.30beta04 [July 10, 2008]
   Merged more cosmetic whitespace changes from libpng-1.4.0beta19.
 
-version 1.0.38rc01, 1.2.30rc01 [July 25, 2008]
+version 1.0.38rc01, 1.2.30rc01 [July 30, 2008]
   No changes.
 
 version 1.0.38rc02, 1.2.30rc02 [July 21, 2008]
@@ -107,6 +107,10 @@ version 1.0.38rc05, 1.2.30rc05 [July 25, 2008]
   Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte.
   Removed two calls to png_check_chunk_name() occuring later in the process.
 
+version 1.0.38rc06, 1.2.30rc06 [July 30, 2008]
+  Added a call to png_check_chunk_name() in pngpread.c
+  Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
 (subscription required; visit 
diff --git a/CHANGES b/CHANGES
index 202a5a4f9c909757cb95d0997515270d823b2425..837a9f4a890153dfc7f9cd7ddb803bc80933d55e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2107,7 +2107,7 @@ version 1.2.27beta01 [April 12, 2008]
   Fixed bug (introduced in libpng-1.0.5h) with handling zero-length
     unknown chunks.
   Added more information about png_set_keep_unknown_chunks() to the
-    documetation.
+    documentation.
   Reject tRNS chunk with out-of-range samples instead of masking off
     the invalid high bits as done in since libpng-1.2.19beta5.
 
@@ -2127,7 +2127,7 @@ version 1.2.27beta04 [April 18, 2008]
   Rebuilt Makefile.in, aclocal.m4, and configure with autoconf-2.62
 
 version 1.2.27beta05 [April 19, 2008]
-  Added MAINTEINERCLEANFILES variable to Makefile.am
+  Added MAINTAINERCLEANFILES variable to Makefile.am
 
 version 1.2.27beta06 [April 21, 2008]
   Avoid changing color_type from GRAY to RGB by
@@ -2186,7 +2186,7 @@ version 1.2.30beta03 [July 6, 2008]
 version 1.2.30beta04 [July 10, 2008]
   Merged more cosmetic whitespace changes from libpng-1.4.0beta19.
 
-version 1.0.38rc01, 1.2.30rc01 [July 25, 2008]
+version 1.0.38rc01, 1.2.30rc01 [July 30, 2008]
   No changes.
 
 version 1.0.38rc02, 1.2.30rc02 [July 21, 2008]
@@ -2208,6 +2208,10 @@ version 1.0.38rc05, 1.2.30rc05 [July 25, 2008]
   Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte.
   Removed two calls to png_check_chunk_name() occuring later in the process.
 
+version 1.0.38rc06, 1.2.30rc06 [July 30, 2008]
+  Added a call to png_check_chunk_name() in pngpread.c
+  Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/INSTALL b/INSTALL
index 384d3240b5e7d4d577215becefce11ed6f32ffae..02e2be2dd8e53918b58f46a31e1386b4e37ee5de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.2.30rc05 - July 25, 2008
+Installing libpng version 1.2.30rc06 - July 30, 2008
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -44,7 +44,7 @@ to have access to the zlib.h and zconf.h include files that
 correspond to the version of zlib that's installed.
 
 You can rename the directories that you downloaded (they
-might be called "libpng-1.2.30rc05" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.30rc06" or "lpng109" and "zlib-1.2.1"
 or "zlib121") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
@@ -101,9 +101,9 @@ include
  CMakeLists.txt    =>  "cmake" script
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       gcc, creates libpng12.so.0.1.2.30rc05)
+                       gcc, creates libpng12.so.0.1.2.30rc06)
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.30rc05)
+                       (gcc, creates libpng12.so.0.1.2.30rc06)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -125,14 +125,14 @@ include
  makefile.openbsd  =>  OpenBSD makefile
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng12.so.0.1.2.30rc05)
+                       creates libpng12.so.0.1.2.30rc06)
  makefile.sunos    =>  Sun makefile
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.30rc05)
+                       creates libpng12.so.0.1.2.30rc06)
  makefile.solaris-x86 =>  Solaris/intelMMX 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.30rc05)
+                       creates libpng12.so.0.1.2.30rc06)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.30rc05)
+                       creates libpng12.so.0.1.2.30rc06)
  makefile.32sunu   =>  Sun Ultra 32-bit makefile
  makefile.64sunu   =>  Sun Ultra 64-bit makefile
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
diff --git a/KNOWNBUG b/KNOWNBUG
index 7bc2736bbd013d62754ea243fe9ed221a23f0743..339dbb4f93c5f36377e76af839946f1e0f58ac6e 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
 
-Known bugs in libpng version 1.2.30rc05
+Known bugs in libpng version 1.2.30rc06
 
 1. February 23, 2006: The custom makefiles don't build libpng with -lz.
 
diff --git a/LICENSE b/LICENSE
index a4a43b527bc57d8eafc8b1b69b4ee977008f7748..a3251daec25fb3a6c22cd77e4c4bfc38e1d37095 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, are
 Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 25, 2008
+July 30, 2008
diff --git a/Makefile.am b/Makefile.am
index 38e935efe56548adf6da885c4fa3b4b5899099d4..b59c35fe21e4f77d269eb487b7ac2654f2dc390d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@ EXTRA_DIST= \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.2.30rc05.txt pngvcrd.c 
+	example.c libpng-1.2.30rc06.txt pngvcrd.c 
 
 CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
 libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 1b2ab46d4e3f864a9d942298a94bea16b83fcfd5..d2666e68aa72b3164c9d041c40e6eb9d36ae9699 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@ EXTRA_DIST = \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.2.30rc05.txt pngvcrd.c 
+	example.c libpng-1.2.30rc06.txt pngvcrd.c 
 
 CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
 libpng.sym
diff --git a/README b/README
index 188aeadb2e69ab98cbb3d73103e676b27249a507..83812ffc534b427a9018a41f09c22e88da0304c8 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.30rc05 - July 25, 2008 (shared library 12.0)
+README for libpng version 1.2.30rc06 - July 30, 2008 (shared library 12.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -194,11 +194,11 @@ Files in this distribution:
        descrip.mms      =>  VMS makefile for MMS or MMK
        makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
        makefile.elf     =>  Linux/ELF makefile symbol versioning,
-                            gcc, creates libpng12.so.0.1.2.30rc05)
+                            gcc, creates libpng12.so.0.1.2.30rc06)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.30rc05)
+                            (gcc, creates libpng12.so.0.1.2.30rc06)
        makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.30rc05,
+                            (gcc, creates libpng12.so.0.1.2.30rc06,
                             uses assembler code tuned for Intel MMX platform)
        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
        makefile.knr     =>  Archaic UNIX Makefile that converts files with
@@ -220,12 +220,12 @@ Files in this distribution:
        makefile.openbsd =>  OpenBSD makefile
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
        makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng12.so.0.1.2.30rc05)
+                            (gcc, creates libpng12.so.0.1.2.30rc06)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng12.so.0.1.2.30rc05)
+                            (gcc, creates libpng12.so.0.1.2.30rc06)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng12.so.0.1.2.30rc05)
+                            (gcc, creates libpng12.so.0.1.2.30rc06)
        makefile.32sunu  =>  Sun Ultra 32-bit makefile
        makefile.64sunu  =>  Sun Ultra 64-bit makefile
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
diff --git a/Y2KINFO b/Y2KINFO
index ae2517cf08946bea93d4bbb37dc939a266837fd1..4c35d86ad9e10404f89141d4df2e85fb7ebcf629 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
    Y2K compliance in libpng:
    =========================
 
-      July 25, 2008
+      July 30, 2008
 
       Since the PNG Development group is an ad-hoc body, we can't make
       an official declaration.
 
       This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.2.30rc05 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.30rc06 are Y2K compliant.  It is my belief that earlier
       versions were also Y2K compliant.
 
       Libpng only has three year fields.  One is a 2-byte unsigned integer
diff --git a/configure b/configure
index 102553489c474257384751eb8c0cd5500541df0d..61e73f6df80bbd3e70f5f7fb03aa73123be663aa 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libpng 1.2.30rc05.
+# Generated by GNU Autoconf 2.62 for libpng 1.2.30rc06.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.30rc05'
-PACKAGE_STRING='libpng 1.2.30rc05'
+PACKAGE_VERSION='1.2.30rc06'
+PACKAGE_STRING='libpng 1.2.30rc06'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 
 ac_unique_file="pngget.c"
@@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.2.30rc05 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.30rc06 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1554,7 +1554,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.2.30rc05:";;
+     short | recursive ) echo "Configuration of libpng 1.2.30rc06:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,7 +1661,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.2.30rc05
+libpng configure 1.2.30rc06
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1675,7 +1675,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.2.30rc05, which was
+It was created by libpng $as_me 1.2.30rc06, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2389,7 +2389,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.2.30rc05'
+ VERSION='1.2.30rc06'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2558,7 +2558,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.2.30rc05
+PNGLIB_VERSION=1.2.30rc06
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=30
@@ -13125,7 +13125,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.2.30rc05, which was
+This file was extended by libpng $as_me 1.2.30rc06, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libpng config.status 1.2.30rc05
+libpng config.status 1.2.30rc06
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 1ad491556bca57135aaa5fd90293416909cc2195..740319ba2b05ab616a63b8c4260a656c4f328cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.2.30rc05], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.30rc06], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.2.30rc05
+PNGLIB_VERSION=1.2.30rc06
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=30
diff --git a/example.c b/example.c
index 2fb9e56ca0369e4d5197021a9ba56c9b1d5fc637..0896c52fbd52294b0454ffeb591024844173e57e 100644
--- a/example.c
+++ b/example.c
@@ -2,7 +2,7 @@
 #if 0 /* in case someone actually tries to compile this */
 
 /* example.c - an example of using libpng
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * This file has been placed in the public domain by the authors.
  * Maintained 1998-2008 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger)
diff --git a/libpng-1.2.30rc05.txt b/libpng-1.2.30rc06.txt
similarity index 99%
rename from libpng-1.2.30rc05.txt
rename to libpng-1.2.30rc06.txt
index d6a57afe5006c68acfdc63930b044d34a234a527..db546a3b84939b41307a77a984bff69e7e1def33 100644
--- a/libpng-1.2.30rc05.txt
+++ b/libpng-1.2.30rc06.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.30rc05 - July 25, 2008
+ libpng version 1.2.30rc06 - July 30, 2008
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.2.30rc05 - July 25, 2008
+ libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2008 Glenn Randers-Pehrson
 
@@ -2851,13 +2851,13 @@ application:
 
 IX. Y2K Compliance in libpng
 
-July 25, 2008
+July 30, 2008
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.30rc05 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.30rc06 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
diff --git a/libpng.3 b/libpng.3
index 0ccd16c336bf3c15720355606af3a69f2724ddc0..881d976fc817311583dfd2c3abbe28bdac083d13 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "July 25, 2008"
+.TH LIBPNG 3 "July 30, 2008"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc05
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc06
 .SH SYNOPSIS
 \fI\fB
 
@@ -821,7 +821,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.30rc05 - July 25, 2008
+ libpng version 1.2.30rc06 - July 30, 2008
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -830,7 +830,7 @@ libpng.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.2.30rc05 - July 25, 2008
+ libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2008 Glenn Randers-Pehrson
 
@@ -3672,13 +3672,13 @@ application:
 
 .SH IX. Y2K Compliance in libpng
 
-July 25, 2008
+July 30, 2008
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.30rc05 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.30rc06 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
@@ -3912,8 +3912,8 @@ the first widely used release:
  1.2.29              13    10229  12.so.0.29[.0]
  1.0.37              10    10037  10.so.0.37[.0]
  1.2.30beta01-04     13    10230  12.so.0.30[.0]
- 1.0.38rc01-05       10    10038  10.so.0.38[.0]
- 1.2.30rc01-05       13    10230  12.so.0.30[.0]
+ 1.0.38rc01-06       10    10038  10.so.0.38[.0]
+ 1.2.30rc01-06       13    10230  12.so.0.30[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3969,7 +3969,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.2.30rc05 - July 25, 2008:
+Libpng version 1.2.30rc06 - July 30, 2008:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -3990,7 +3990,7 @@ included in the libpng distribution, the latter shall prevail.)
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, are
 Copyright (c) 2004,2006-2008 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -4089,7 +4089,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 25, 2008
+July 30, 2008
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 106bc65674a387ffb01994233e9f7c431b7f5e06..07d40094dfb463a4760e57d30db99500f5e6f36e 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "July 25, 2008"
+.TH LIBPNGPF 3 "July 30, 2008"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc05
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc06
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index fc9b384c61ed1a1cba98a856910cea4d8e07f5b6..619e8d03fc1b4afb3736327df8bc0acc8fe7db9f 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 25, 2008"
+.TH PNG 5 "July 30, 2008"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 29a80e6968199c0b96a2f245bf083a3075dda051..ffca94c6806b2539ef236f98881b0915102b3def 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -13,7 +13,7 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_30rc05 Your_png_h_is_not_version_1_2_30rc05;
+typedef version_1_2_30rc06 Your_png_h_is_not_version_1_2_30rc06;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
@@ -694,7 +694,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
    png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.30rc05 - July 25, 2008\n\
+   return ((png_charp) "\n libpng version 1.2.30rc06 - July 30, 2008\n\
    Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
    Copyright (c) 1996-1997 Andreas Dilger\n\
    Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index 12980d732b56ecea7ae6a171df76e98fbf64413e..53959356f34e0cddf68e856c2cb0db604755ba4c 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.2.30rc05 - July 25, 2008
+ * libpng version 1.2.30rc06 - July 30, 2008
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -8,7 +8,7 @@
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.30rc05 - July 25, 2008: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -194,8 +194,8 @@
  *    1.2.29                  13    10229  12.so.0.29[.0]
  *    1.0.37                  10    10037  10.so.0.37[.0]
  *    1.2.30beta01-04         13    10230  12.so.0.30[.0]
- *    1.0.38rc01-05           10    10038  10.so.0.38[.0]
- *    1.2.30rc01-05           13    10230  12.so.0.30[.0]
+ *    1.0.38rc01-06           10    10038  10.so.0.38[.0]
+ *    1.2.30rc01-06           13    10230  12.so.0.30[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -225,7 +225,7 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, are
  * Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -337,13 +337,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    July 25, 2008
+ *    July 30, 2008
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.30rc05 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.30rc06 are Y2K compliant.  It is my belief that earlier
  *    versions were also Y2K compliant.
  *
  *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -399,9 +399,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.30rc05"
+#define PNG_LIBPNG_VER_STRING "1.2.30rc06"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.30rc05 - July 25, 2008\n"
+   " libpng version 1.2.30rc06 - July 30, 2008\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -413,7 +413,7 @@
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
 
-#define PNG_LIBPNG_VER_BUILD  05
+#define PNG_LIBPNG_VER_BUILD  06
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1458,7 +1458,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef png_structp version_1_2_30rc05;
+typedef png_structp version_1_2_30rc06;
 
 typedef png_struct FAR * FAR * png_structpp;
 
diff --git a/pngconf.h b/pngconf.h
index ba82efd640a960678c71027dd979ce1dee1f2150..b670733799ebc8c78e3a3189e65c112fbe2b9d29 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.2.30rc05 - July 25, 2008
+ * libpng version 1.2.30rc06 - July 30, 2008
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 9a5466a8e16720685af114126e777258cd2fd8c4..3338fa3c18238b2e49692a918c73cd203733b60a 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -44,13 +44,7 @@ png_error(png_structp png_ptr, png_const_charp error_message)
      {
        if (*error_message == '#')
        {
-         /*
-          *                 012345678901234567890
-          *  error_message: #nnnn   text\0
-          *  error_number:  nnnn\0
-          *  offset points to the first blank after nnnn
-          *  In this example, offset is 5.
-          */
+         /* Strip "#nnnn " from beginning of error message. */
            int offset;
            for (offset = 1; offset<15; offset++)
               if (error_message[offset] == ' ')
@@ -60,7 +54,7 @@ png_error(png_structp png_ptr, png_const_charp error_message)
               int i;
               for (i = 0; i < offset - 1; i++)
                  msg[i] = error_message[i + 1];
-              msg[i] = '\0';
+              msg[i - 1] = '\0';
               error_message = msg;
            }
            else
@@ -223,14 +217,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
    if (*error_message == '#')
    {
-     /*
-      *                 012345678901234567890
-      *  error_message: #nnnn   text\0
-      *  error_number:  nnnn\0
-      *  offset points to the first blank after nnnn
-      *  In this example, offset is 5, and we want to
-      *  insert a terminating NULL at error_number[4].
-      */
+     /* Strip "#nnnn " from beginning of warning message. */
      int offset;
      char error_number[16];
      for (offset = 0; offset<15; offset++)
@@ -241,10 +228,9 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
      }
      if ((offset > 1) && (offset < 15))
      {
-       error_number[offset - 1] = '\0'; /* should this be [offset + 1]? */
-       /* should we update "offset" to point to the beginning of the text? */
+       error_number[offset - 1] = '\0';
        fprintf(stderr, "libpng error no. %s: %s\n", error_number,
-          error_message + offset);
+          error_message + offset + 1);
      }
      else
        fprintf(stderr, "libpng error: %s, offset=%d\n", error_message, offset);
diff --git a/pngget.c b/pngget.c
index d365eb9fed504f6a984de3110b05e7436e6cb2de..41ddf292d4c45725fade226eb628e4888f54673c 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index a2652b5beebd5e605945ef72a879880264bb6d6c..588e9c0e3166a87e42f57c38ef2565beb39390be 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index f219b7bc1f25d2200e52449192c2c6edfd0a4382..56e73334f23de96e22fcaaaf88c6d2ca1cc6a67a 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -212,6 +212,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
       png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
       png_reset_crc(png_ptr);
       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
    }
 
@@ -221,10 +222,10 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 
    if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
    {
+      if (png_ptr->push_length != 13)
+         png_error(png_ptr, "Invalid IHDR length");
       if (png_ptr->push_length + 4 > png_ptr->buffer_size)
       {
-         if (png_ptr->push_length != 13)
-            png_error(png_ptr, "Invalid IHDR length");
          png_push_save_buffer(png_ptr);
          return;
       }
@@ -598,6 +599,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
    }
 }
 
+
 void /* PRIVATE */
 png_push_save_buffer(png_structp png_ptr)
 {
@@ -1463,10 +1465,6 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
    length)
 {
    png_uint_32 skip = 0;
-#if 0
-   /* Redundant? */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-#endif
 
    if (!(png_ptr->chunk_name[0] & 0x20))
    {
diff --git a/pngread.c b/pngread.c
index 99391fa8746d616ea602efb90ab0d5c541c27388..6e9d57bfd5e1a1cc8ff2926593e5b6c5a0f4be37 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrio.c b/pngrio.c
index f8ded82dc4db732905ae0ac7222250fae420e8f5..6d15707bcec099a865f7c8d16703ba653c5a1af7 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 3b4df99ae77d861f1933e15a4f71401b716dd2eb..f0bfe1bae47521dcff9850e771f1077ec157d19b 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 985b6e4cc4d12fe73a7d8275673db94f05953207..074630f13d4ae08ac2f1bd851b1e0bb54100caef 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -2243,11 +2243,6 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
          png_ptr->mode |= PNG_AFTER_IDAT;
    }
 
-#if 0
-   /* Redundant? */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-#endif
-
    if (!(png_ptr->chunk_name[0] & 0x20))
    {
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
@@ -2328,14 +2323,13 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    the chunk name itself is valid. */
 
 #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-#define isnonupper(c) ((c) < 65 || (c) > 90)
 
 void /* PRIVATE */
 png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
 {
    png_debug(1, "in png_check_chunk_name\n");
    if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
-       isnonupper(chunk_name[2]) || isnonalpha(chunk_name[3]))
+       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
    {
       png_chunk_error(png_ptr, "invalid chunk type");
    }
diff --git a/pngset.c b/pngset.c
index ef61e390396435023f8670c56fbe3a0fbc50fc23..6a9b3f2d29a28afcd021b56a90fb303d9df388b0 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 5e0ff145dd3b9e9f32dd1e9c5c6a04c8c66a1e7f..8faba25d65660992bda637c6f423378ff6ba5659 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1685,4 +1685,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_30rc05 your_png_h_is_not_version_1_2_30rc05;
+typedef version_1_2_30rc06 your_png_h_is_not_version_1_2_30rc06;
diff --git a/pngtrans.c b/pngtrans.c
index 972bb2c083813e48fa7aee7820e0bb39cff3c5f6..c73b360d6dadd7286a3477ae5a3701efb5c09c0e 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwio.c b/pngwio.c
index 0731718879e2a638a66145b78523f434c622d0c9..58176f7a0549c142253212c05aa09b8c3716d66b 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index e69706d93737cebe20437a0ceb2086e8d7442398..647c1082d867babfe74f8c71b87212da60445ef9 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 6c43b0ffb262a30cbbbe59023b596d0b074ef9f3..0dfa0c97e175ecf50d03d2dd257e2d3472a9eb42 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.2.30 [July 25, 2008]
+ * Last changed in libpng 1.2.30 [July 30, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index d7d2758eb81e6749563f7871138e4614a84f7c63..bbca3339176ee1efd9c6802b3a462a7496b2662e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
 
 # SET UP LINKS
 set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#    VERSION 0.${PNGLIB_RELEASE}.1.2.30rc05
+#    VERSION 0.${PNGLIB_RELEASE}.1.2.30rc06
      VERSION 0.${PNGLIB_RELEASE}.0
      SOVERSION 0
      CLEAN_DIRECT_OUTPUT 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 15a0eea77d1981a0fcaa658a44475c9c49922e62..7419079db858eae0dfd204da0766e8d050c69f49 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.30rc05
+version=1.2.30rc06
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index fbac27d8a6d155945898aa1feda6a40efbb24dd4..302983b779701235c6f5a89640359e9bd10cf688 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.30rc05
+Version: 1.2.30rc06
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index b76dc666de951455218d0a021dfe5254937f9232..023a7a2526348a4f006933be029287ea37272f96 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 7afc21f8b3aa685e2fc4739c7ec8638f7626de35..31fce032eb69d4949677cf4bc1128a0e6154b7ee 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index e09ea3714f08a3fd085a02384820d40d558d6376..d6f5a65b2ca3c22913999a290d7bfdd3f51f71dc 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index da6db5d517cbab6207616d631e5d5e16efaf9be8..c43166fe59ec93bf368540f3164e3913c8a9c49f 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 7943469561f9010f4d5ba32a396372cbf72b8899..52399dac56d9830309fe298704adf30e8c96b2ee 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 4257e3155bd89e71c81c973a4a914c6dbdc3dac2..afb3054107dab8a3c38c8a3352fa65834e31d90e 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 12
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 94866af1f9aee9f9ef64e22b75d2c438a3e50313..d5719b3e261a739501a49a5b48781b7f067a4b1e 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 476fbe3bf69149ee415a2386239d4203b86863f2..dfd33bb14d27bb1a2ddce4ab262a2a4629a38a68 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 3c993a357f6da2252e68e53eef06d20ef150e148..74c1895794fc440597fa6571677b80059ada30ed 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 52f2c51f883136d3facf796a4f05126061db547b..79abee54a4a42286b71b15ea1fccc1e35aad931e 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 0f2c238d8b311b06ea969dae3e2266c19624eeb4..5f055f453fe66fa18872f3ec0739ddcb9fe03e76 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 67b6a77af22fa2c41de0c8bc4047a111c4deba44..67a621f5aa0efa5f41b08c75f633f21ea538b89d 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 557474c40994a43583eaa187f49615bbb810db8b..4cd28b3bd092ba393fb001ecfc4d6b7007739dac 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 7515934a0a29406e7dc9313a2964d8bc2383ef74..5bef82966bb8fcd3e1923c5d29f12826640436b1 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index feba8ec5b9e334f4d0ab9997e2d2fb12ace017a3..56601fef194264a084902cdfe2046f67aabccd90 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.30rc05
+SHLIB_MINOR=	1.2.30rc06
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index f5c69ec58858cfa1236b5b086e098b6e8fed41db..6a10014ecae323cf89663fffff2722062c08ed36 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.30rc05
+SHLIB_MINOR=	1.2.30rc06
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index eb358a991490f2562f3ed2cdede9978f52b2502e..2834f62612b264585ecf42221d85d770e27311cb 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 28260b2306843ea759919732807af09aee3623d6..4df1561bc328224ff7436248310f210913844fd7 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.30rc05
+SHLIB_MINOR=	1.2.30rc06
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index ac8de5382752ac94ed383c7a7c9c17d9e96dbde9..9867b478072d7b61be99cc8b9f82c804bb369fe7 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 8d07caf63f07cbcb042068b792d0235ea60b7817..2bdf98673c1488eed93764ce5573c5467c14600c 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 2d949180c56e0e631a28fc5da3a942965863d61b..50a746326381ecb8bd91d71f42902fedc5aea4b3 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 4f42e3d96d9cfe3191d2594f55caa1672ebbdba1..fe1ba027811ff9b04321f21849eedec895c5c25d 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 21db19eb7f187768edeb6e2c43f09d436e58ece3..aba4edd49724879a85bacf1a65905a4f4f976a36 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 38fd2a7191ca4463b42950f93fff04fd6c27669d..88e0e5385d81f3887227d7219911efdfc26aa53e 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.30rc05
+PNGMIN = 1.2.30rc06
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 07adec525be641fb72ea090e07cc9c6de940779e..03a7e25977f777a6c00e871421ef57aa5ec0db7c 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.30rc05
+; Version 1.2.30rc06
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 64ff2a5d3c7c8a3147d5850ad7fb1d45d2f0ffd9..caf4b7c216f96604328d97e95194392e0f1772a9 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.2.30rc05
+;Version 1.2.30rc06
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3