diff --git a/ANNOUNCE b/ANNOUNCE
index c8a60e1d6..e98198bad 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.0.7rc2 - June 28, 2000
+Libpng 1.0.7 - July 1, 2000
 
 This is a public release of libpng, intended for use in production codes.
 
@@ -60,6 +60,8 @@ Changes since the last public release (1.0.6):
   Made PNG_NO_ITXT_SUPPORTED the default setting, to avoid memory overrun
     when old applications fill the info_ptr->text structure directly.
   Added PNGAPI macro, and added it to the definitions of all exported functions.
+  Relocated version macro definitions ahead of the includes of zlib.h and
+    pngconf.h in png.h.
   Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.
   Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined.
   Added png_access_version_number() function.
@@ -93,6 +95,7 @@ Changes since the last public release (1.0.6):
     (Simon-Pierre Cadieux) and contrib/visupng directory (Willem van Schaik).
   Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.
   Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.
+  Revised the definition of "trans_values" in libpng.3/libpng.txt
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 7768d6458..ed6443067 100644
--- a/CHANGES
+++ b/CHANGES
@@ -737,6 +737,8 @@ version 1.0.7beta11 [May 7, 2000]
   Made PNG_NO_ITXT_SUPPORTED the default setting, to avoid memory overrun
     when old applications fill the info_ptr->text structure directly.
   Added PNGAPI macro, and added it to the definitions of all exported functions.
+  Relocated version macro definitions ahead of the includes of zlib.h and
+    pngconf.h in png.h.
 version 1.0.7beta12 [May 12, 2000]
   Revised pngset.c to avoid a problem with expanding the png_debug macro.
   Deleted some extraneous defines from pngconf.h
@@ -791,7 +793,10 @@ version 1.0.7beta18 [June 23, 2000]
   Updated contrib/visupng/cexcept.h to version 1.0.0.
   Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.
 version 1.0.7rc2 [June 28, 2000]
+  Updated license to include disclaimers required by UCITA.
   Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.
+version 1.0.7 [July 1, 2000]
+  Revised the definition of "trans_values" in libpng.3/libpng.txt
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index a8e6230de..21ab07b14 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.0.7rc2 - June 28, 2000
+Installing libpng version 1.0.7 - July 1, 2000
 
 Before installing libpng, you must first install zlib.  zlib
 can usually be found wherever you got libpng.  zlib can be
@@ -10,7 +10,7 @@ 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.0.7rc2" or "lpng107" and "zlib-1.1.3"
+might be called "libpng-1.0.7" or "lpng107" and "zlib-1.1.3"
 or "zlib113") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
@@ -54,8 +54,8 @@ The files that are presently available in the scripts directory
 include
 
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.7rc2)
- makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.7rc2,
+ makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.7)
+ makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.7,
                        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
@@ -67,9 +67,9 @@ include
  makefile.intel    =>  Intel C/C++ version 4.0 and later
  libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.7rc2)
+ makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.7)
  makefile.sunos    =>  Sun makefile
- makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.7rc2)
+ makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.7)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.mips     =>  MIPS makefile
  makefile.acorn    =>  Acorn makefile
diff --git a/LICENSE b/LICENSE
index cb4ae7888..d5d60238b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,29 +1,57 @@
-COPYRIGHT NOTICE:
 
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-(libpng versions 0.5, May 1995, through 0.89c, May 1996)
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng version 1.0.7, July 1, 2000 is Copyright (c) 2000 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Gilles Vollant
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
 Copyright (c) 1996, 1997 Andreas Dilger
-(libpng versions 0.90, December 1996, through 0.96, May 1997)
-Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
-(libpng versions 0.97, January 1998, through 1.0.7rc2, June 28, 2000)
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
 
    John Bowler
    Kevin Bracey
    Sam Bushell
-   Andreas Dilger
    Magnus Holmgren
-   Tom Lane
-   Dave Martindale
-   Glenn Randers-Pehrson
-   Eric S. Raymond
    Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
    Guy Eric Schalnat
    Paul Schmidt
-   Tom Tanner
-   Willem van Schaik
    Tim Wegner
 
 The PNG Reference Library is supplied "AS IS".  The Contributing Authors
@@ -38,16 +66,13 @@ Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:
 
- 1. The origin of this source code must not be
-    misrepresented.
+1. The origin of this source code must not be misrepresented.
 
- 2. Altered versions must be plainly marked as such
-    and must not be misrepresented as being the
-    original source.
+2. Altered versions must be plainly marked as such and must not
+   be misrepresented as being the original source.
 
- 3. This Copyright notice may not be removed or
-    altered from any source or altered source
-    distribution.
+3. This Copyright notice may not be removed or altered from any
+   source or altered source distribution.
 
 The Contributing Authors and Group 42, Inc. specifically permit, without
 fee, and encourage the use of this source code as a component to
@@ -55,6 +80,7 @@ supporting the PNG file format in commercial products.  If you use this
 source code in a product, acknowledgment is not required but would be
 appreciated.
 
+
 A "png_get_copyright" function is available, for convenient use in "about"
 boxes and the like:
 
@@ -68,4 +94,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 randeg@alum.rpi.edu
-June 28, 2000
+July 1, 2000
diff --git a/README b/README
index 3d84a3cc5..ba3dce482 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.0.7rc2 - June 28, 2000 (shared library 2.1)
+README for libpng 1.0.7 - July 1, 2000 (shared library 2.1)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -176,9 +176,9 @@ Files in this distribution:
        descrip.mms      =>  VMS makefile for MMS or MMK
        makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng.so.2.1.0.7rc2)
+                            (gcc, creates libpng.so.2.1.0.7)
        makefile.gcmmx   =>  Linux/ELF makefile (gcc, creates
-                            libpng.so.2.1.0.7rc2, uses assembler code
+                            libpng.so.2.1.0.7, 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
@@ -190,10 +190,10 @@ Files in this distribution:
        makefile.intel   =>  Intel C/C++ version 4.0 and later
        libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
-       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.7rc2)
+       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.7)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng.so.2.1.0.7rc2)
+                            (gcc, creates libpng.so.2.1.0.7)
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
        makefile.mips    =>  MIPS makefile
        makefile.acorn   =>  Acorn makefile
diff --git a/Y2KINFO b/Y2KINFO
index 4f846cb3d..f35c13238 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
    Y2K compliance in libpng:
    =========================
 
-      June 28, 2000
+      July 1, 2000
 
       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.0.7rc2 are Y2K compliant.  It is my belief that earlier
+      upward through 1.0.7 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 1de4d57d7..28a1985fb 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 echo "
-  There is no \"configure\" script for Libpng-1.0.7rc2.  Instead, please
+  There is no \"configure\" script for Libpng-1.0.7.  Instead, please
   copy the appropriate makefile for your system from the \"scripts\"
   directory.  Read the INSTALL file for more details.
 "
diff --git a/contrib/gregbook/Makefile.unx b/contrib/gregbook/Makefile.unx
index ed2e4f403..850ddcebf 100644
--- a/contrib/gregbook/Makefile.unx
+++ b/contrib/gregbook/Makefile.unx
@@ -40,7 +40,7 @@ ZLIB = /usr/local/lib/libz.a		# statically linked against zlib
 
 #XINC = -I/usr/include/X11		# old-style, stock X distributions
 #XLIB = -L/usr/lib/X11 -lX11
-#XINC = -I/usr/openwin/include/X11	# Sun workstations (OpenWindows)
+#XINC = -I/usr/openwin/include    	# Sun workstations (OpenWindows)
 #XLIB = -L/usr/openwin/lib -lX11
 XINC = -I/usr/X11R6/include		# new X distributions (XFree86, etc.)
 XLIB = -L/usr/X11R6/lib -lX11
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index a0cd8e5d3..959afe9de 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -348,11 +348,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
         // we can allocate memory for an array of row-pointers
         
         if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL)
-        {
-            fclose(pfFile);
-            png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
-            return FALSE;
-        }
+            Throw "Visualpng: Out of memory";
         
         // set the individual row-pointers to point at the correct offsets
         
diff --git a/libpng.3 b/libpng.3
index 7a25ed092..54a0a052f 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 28, 2000"
+.TH LIBPNG 3 "July 1, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.7rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.7
 .SH SYNOPSIS
 \fI\fB
 
@@ -747,7 +747,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.0.7rc2 - June 28, 2000
+ libpng version 1.0.7 - July 1, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -1269,8 +1269,9 @@ into the info_ptr is returned for any complex types.
                      &trans_values);
     trans          - array of transparent entries for
                      palette (PNG_INFO_tRNS)
-    trans_values   - transparent pixel for non-paletted
-                     images (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
     num_trans      - number of transparent entries
                      (PNG_INFO_tRNS)
 
@@ -2443,8 +2444,9 @@ Some of the more important parts of the png_info are:
        trans_values);
     trans          - array of transparent entries for
                      palette (PNG_INFO_tRNS)
-    trans_values   - transparent pixel for non-paletted
-                     images (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
     num_trans      - number of transparent entries
                      (PNG_INFO_tRNS)
 
@@ -3379,13 +3381,13 @@ application:
 
 .SH VII. Y2K Compliance in libpng
 
-June 28, 2000
+July 1, 2000
 
 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.0.7rc2 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.7 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
@@ -3526,7 +3528,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.0.7rc2 - June 28, 2000:
+Libpng version 1.0.7 - July 1, 2000:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
 
@@ -3534,36 +3536,64 @@ Supported by the PNG development group
 .br
 (png-implement@ccrc.wustl.edu).
 
-.SH COPYRIGHT NOTICE:
+.SH COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-(libpng versions 0.5, May 1995, through 0.88, January 1996)
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng version 1.0.7, July 1, 2000 is
+Copyright (c) 2000 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Gilles Vollant
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
 Copyright (c) 1996, 1997 Andreas Dilger
-(libpng versions 0.89c, May 1996, through 0.96, May 1997)
-Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
-(libpng versions 0.97, January 1998, through 1.0.7rc2, June 28, 2000)
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
 
    John Bowler
    Kevin Bracey
    Sam Bushell
-   Andreas Dilger
    Magnus Holmgren
-   Tom Lane
-   Dave Martindale
-   Glenn Randers-Pehrson
-   Eric S. Raymond
    Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
    Guy Eric Schalnat
    Paul Schmidt
-   Tom Tanner
-   Willem van Schaik
    Tim Wegner
 
-The PNG Reference Library (libpng) is supplied "AS IS".  The Contributing
-Authors and Group 42, Inc. disclaim all warranties, expressed or implied,
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
 including, without limitation, the warranties of merchantability and of
 fitness for any purpose.  The Contributing Authors and Group 42, Inc.
 assume no liability for direct, indirect, incidental, special, exemplary,
@@ -3574,16 +3604,13 @@ Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:
 
- 1. The origin of this source code must not be
-    misrepresented.
+1. The origin of this source code must not be misrepresented.
 
- 2. Altered versions must be plainly marked as such
-    and must not be misrepresented as being the
-    original source.
+2. Altered versions must be plainly marked as such and must not
+   be misrepresented as being the original source.
 
- 3. This Copyright notice may not be removed or
-    altered from any source or altered source
-    distribution.
+3. This Copyright notice may not be removed or altered from any
+   source or altered source distribution.
 
 The Contributing Authors and Group 42, Inc. specifically permit, without
 fee, and encourage the use of this source code as a component to
@@ -3591,6 +3618,7 @@ supporting the PNG file format in commercial products.  If you use this
 source code in a product, acknowledgment is not required but would be
 appreciated.
 
+
 A "png_get_copyright" function is available, for convenient use in "about"
 boxes and the like:
 
@@ -3599,8 +3627,12 @@ boxes and the like:
 Also, the PNG logo (in PNG format, of course) is supplied in the
 file "pngnow.png".
 
-Libpng is OSI Certified Open Source Software.  OSI Certified is a
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
 certification mark of the Open Source Initiative.
 
+Glenn Randers-Pehrson
+randeg@alum.rpi.edu
+July 1, 2000
+
 .\" end of man page
 
diff --git a/libpng.txt b/libpng.txt
index 39fe06d2e..0d67cd9fe 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.0.7rc2 - June 28, 2000
+ libpng version 1.0.7 - July 1, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -522,8 +522,9 @@ into the info_ptr is returned for any complex types.
                      &trans_values);
     trans          - array of transparent entries for
                      palette (PNG_INFO_tRNS)
-    trans_values   - transparent pixel for non-paletted
-                     images (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
     num_trans      - number of transparent entries
                      (PNG_INFO_tRNS)
 
@@ -1696,8 +1697,9 @@ Some of the more important parts of the png_info are:
        trans_values);
     trans          - array of transparent entries for
                      palette (PNG_INFO_tRNS)
-    trans_values   - transparent pixel for non-paletted
-                     images (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
     num_trans      - number of transparent entries
                      (PNG_INFO_tRNS)
 
@@ -2632,13 +2634,13 @@ application:
 
 VII. Y2K Compliance in libpng
 
-June 28, 2000
+July 1, 2000
 
 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.0.7rc2 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.7 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/libpngpf.3 b/libpngpf.3
index f3b2065f1..bf60097eb 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 28, 2000"
+.TH LIBPNGPF 3 "July 1, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.7rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.7
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/msvc/README.txt b/msvc/README.txt
index 6c73e2c6c..ab851895c 100644
--- a/msvc/README.txt
+++ b/msvc/README.txt
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Build File, Format Version 6.00 for
-libpng 1.0.7rc2 (June 28, 2000) and zlib
+libpng 1.0.7 (July 1, 2000) and zlib
 
 Copyright (C) 2000 Simon-Pierre Cadieux
 For conditions of distribution and use, see copyright notice in png.h
diff --git a/msvc/png32ms.def b/msvc/png32ms.def
index c3bac85ac..afa264261 100644
--- a/msvc/png32ms.def
+++ b/msvc/png32ms.def
@@ -6,7 +6,7 @@ LIBRARY
 DESCRIPTION "PNG image compression library for Windows"
 
 EXPORTS
-;Version 1.0.7rc2
+;Version 1.0.7
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3
diff --git a/png.5 b/png.5
index d5d90f4aa..91387c9a1 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 28, 2000"
+.TH PNG 5 "July 1, 2000"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 7f8592b55..00e4d3793 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * libpng version 1.0.7rc2 - June 28, 2000
+ * libpng version 1.0.7 - July 1, 2000
  * Copyright (c) 1998, 1999, 2000 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.)
@@ -14,14 +14,14 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_7rc2 Your_png_h_is_not_version_1_0_7rc2;
+typedef version_1_0_7 Your_png_h_is_not_version_1_0_7;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
 
 #ifdef PNG_USE_GLOBAL_ARRAYS
 /* png_libpng_ver was changed to a function in version 1.0.5c */
-char png_libpng_ver[12] = "1.0.7rc2";
+char png_libpng_ver[12] = "1.0.7";
 
 /* png_sig was changed to a function in version 1.0.5c */
 /* Place to hold the signature string for a PNG file. */
@@ -605,7 +605,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
    if (png_ptr != NULL || png_ptr == NULL)  /* silence compiler warning */
-   return ("\n libpng version 1.0.7rc2 - June 28, 2000\n\
+   return ("\n libpng version 1.0.7 - July 1, 2000\n\
    Copyright (c) 1998-2000 Glenn Randers-Pehrson\n\
    Copyright (c) 1996, 1997 Andreas Dilger\n\
    Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -623,8 +623,8 @@ png_get_libpng_ver(png_structp png_ptr)
 {
    /* Version of *.c files used when building libpng */
    if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
-      return("1.0.7rc2");
-   return("1.0.7rc2");
+      return("1.0.7");
+   return("1.0.7");
 }
 
 png_charp PNGAPI
diff --git a/png.h b/png.h
index b5bdc4efb..cdf3e1bd0 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.0.7rc2 - June 28, 2000
+ * libpng version 1.0.7 - July 1, 2000
  * Copyright (c) 1998, 1999, 2000 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.)
@@ -9,7 +9,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.0.7rc2 - June 28, 2000: Glenn
+ *  libpng versions 0.97, January 1998, through 1.0.7 - July 1, 2000: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -54,8 +54,6 @@
  *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
  *    1.0.7beta11-18                10007  2.1.0.7beta11-18 (binary compatible)
  *    1.0.7rc1-2                    10007  2.1.0.7rc1-2 (binary compatible)
- *    planned:
- *    1.0.6patch4 (w/4 patches)     10006  2.1.0.6 (binary compatible)
  *    1.0.7                         10007  (still compatible)
  *
  *    Henceforth the source version will match the shared-library major
@@ -83,17 +81,26 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
- * libpng versions 1.0.6, March 20, 2000, through 1.0.7rc2, June 28, 2000, are
+ * libpng version 1.0.7, July 1, 2000, is
  * Copyright (c) 2000 Glenn Randers-Pehrson
- * Distributed according to the same disclaimer and license as libpng-1.0.5
- * with the following individuals added to the list of Contributing Authors:
+ * Distributed according to the same disclaimer and license as libpng-1.0.6
+ * with the following individuals added to the list of Contributing Authors
  *
  *    Simon-Pierre Cadieux
  *    Eric S. Raymond
  *    Gilles Vollant
  *
- * libpng versions 0.97, January 1998, through 1.0.5, October 15, 1999, are
- * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ * and with the following additions to the disclaimer:
+ *
+ *    There is no warranty against interference with your enjoyment of the
+ *    library or against infringement.  There is no warranty that our
+ *    efforts or the library will fulfill any of your particular purposes
+ *    or needs.  This library is provided with all faults, and the entire
+ *    risk of satisfactory quality, performance, accuracy, and effort is with
+ *    the user.
+ *
+ * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * Distributed according to the same disclaimer and license as libpng-0.96,
  * with the following individuals added to the list of Contributing Authors:
  *
@@ -179,13 +186,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    June 28, 2000
+ *    July 1, 2000
  *
  *    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.0.7rc2 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.0.7 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
@@ -241,7 +248,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.7rc2"
+#define PNG_LIBPNG_VER_STRING "1.0.7"
 
 #define PNG_LIBPNG_VER_SONUM   2
 
@@ -251,7 +258,7 @@
 #define PNG_LIBPNG_VER_RELEASE 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   2
+#define PNG_LIBPNG_VER_BUILD   0
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -1140,9 +1147,9 @@ struct png_struct_def
 };
 
 /* This prevents a compiler error in png_get_copyright() in png.c if png.c
-and png.h are both at * version 1.0.7rc2
+and png.h are both at * version 1.0.7
  */
-typedef png_structp version_1_0_7rc2;
+typedef png_structp version_1_0_7;
 
 typedef png_struct FAR * FAR * png_structpp;
 
@@ -2161,7 +2168,7 @@ extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr)
 extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
 
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.0.7rc2 - June 28, 2000 (header)\n"
+   " libpng version 1.0.7 - July 1, 2000 (header)\n"
 
 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines we avoid an integer divide, which will be slower on
diff --git a/pngasmrd.h b/pngasmrd.h
index 7e72db409..64ddbbc2d 100644
--- a/pngasmrd.h
+++ b/pngasmrd.h
@@ -1,6 +1,6 @@
 /* pngasmrd.h - assembler version of utilities to read a PNG file
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1999, 2000 Glenn Randers-Pehrson
  *
diff --git a/pngconf.h b/pngconf.h
index fa155b3f7..856ffe8f2 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -640,7 +640,7 @@ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #  endif
 #endif
-#if !defined (PNG_NO_READ_USER_CHUNKS) && \
+#if !defined(PNG_NO_READ_USER_CHUNKS) && \
      defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
 #  define PNG_READ_USER_CHUNKS_SUPPORTED
 #  define PNG_USER_CHUNKS_SUPPORTED
diff --git a/pngerror.c b/pngerror.c
index 8b7eab395..0f950df28 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index 6a5ddf40c..9edb89862 100644
--- a/pnggccrd.c
+++ b/pnggccrd.c
@@ -6,7 +6,7 @@
  *     and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
  *     for Intel's performance analysis of the MMX vs. non-MMX code.
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * Copyright (c) 1998, Intel Corporation
@@ -146,7 +146,7 @@ static const int png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
 
 // djgpp and Win32 add their own underscores to global variables,
 // so define them without:
-#if (defined __DJGPP__) || defined (WIN32)
+#if defined(__DJGPP__) || defined(WIN32)
 #  define _unmask      unmask
 #  define _const4      const4
 #  define _const6      const6
diff --git a/pngget.c b/pngget.c
index 3102dd37e..66f24a3be 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index d4a29460c..d336afaac 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index 24e27f4c4..b44c890d5 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index aa34ff47a..b46a0a71a 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -697,7 +697,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
  * not called png_set_interlace_handling(), the display_row buffer will
  * be ignored, so pass NULL to it.
  *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.7rc2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.7
  */
 
 void PNGAPI
@@ -746,7 +746,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
  * only call this function once.  If you desire to have an image for
  * each pass of a interlaced image, use png_read_rows() instead.
  *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.7rc2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.7
  */
 void PNGAPI
 png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index 390319312..ca46c80ad 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
 
 /* pngrio.c - functions for data input
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 5489d232e..03ed2fa42 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 7619fa2f9..1098ae220 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index 0c9b4c63e..ff17941a6 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 131358e41..ea8729afc 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1392,4 +1392,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_7rc2 your_png_h_is_not_version_1_0_7rc2;
+typedef version_1_0_7 your_png_h_is_not_version_1_0_7;
diff --git a/pngtrans.c b/pngtrans.c
index fa5307dee..3cf4ca3e3 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)
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngvcrd.c b/pngvcrd.c
index afeaeebfe..1d1594e12 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
  *
  * For Intel x86 CPU and Microsoft Visual C++ compiler
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * Copyright (c) 1998, Intel Corporation
diff --git a/pngwio.c b/pngwio.c
index 01c1e0245..636d0eef6 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
 
 /* pngwio.c - functions for data output
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 1c7cd0ee1..24fa20b07 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwtran.c b/pngwtran.c
index d066e3602..3e6f64483 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 78ba9f7aa..a955ff98b 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * libpng 1.0.7rc2 - June 28, 2000
+ * libpng 1.0.7 - July 1, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index d3705741c..90b178bc7 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -3,7 +3,7 @@
 # To build the library, do:
 #       "make -fmakefile.bc32"
 #
-# ---------- 32-bit Borland C++ ----------
+# -------------------- 32-bit Borland C++ --------------------
 
 ### Absolutely necessary for this makefile to work
 .AUTODEPEND
diff --git a/scripts/makefile.bd32 b/scripts/makefile.bd32
index d8257af64..bc7e1933d 100644
--- a/scripts/makefile.bd32
+++ b/scripts/makefile.bd32
@@ -1,5 +1,5 @@
 # Makefile for png32bd.dll
-# ------------- 32-bit Borland C++ -------------
+# -------------------- 32-bit Borland C++ --------------------
 
 # This makefile expects to find zlib.h and zlib32bd.lib in the
 # $(ZLIBDIR) directory.
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 787ce2c7c..eddb34cd7 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -31,7 +31,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # where make install puts libpng.a, libpng.so*, and png.h
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index a8698d152..54005ea8a 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -14,7 +14,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=cc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 2b6104382..acec3012c 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 29b65ee27..f005c5d4c 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 3512e7f55..651281c32 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -3,7 +3,7 @@
 # For conditions of distribution and use, see copyright notice in png.h
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 
-# -------- Microsoft C 5.1 and later, does not use assembler code -----
+# -------- Microsoft C 5.1 and later, does not use assembler code --------
 MODEL=L
 CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib
 #-Ox generates bad code with MSC 5.1
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 6a6aad980..a8ea1eed7 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index e3fd9435b..82f442b2a 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=gcc -shared
 
-VER=1.0.7rc2
-LIBS=libpng.so.1.0.7rc2
+VER=1.0.7
+LIBS=libpng.so.1.0.7
 SHAREDLIB=libpng.so
 libdir=$(prefix)/lib32
 
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 4d538479d..5fa530f51 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.7rc2
+PNGMIN = 1.0.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index 3dfed67e1..21435a68e 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -3,7 +3,7 @@
 
 # To use, do "make -fmakefile.tc3"
 
-# ------ Turbo C 3.00 (can be modified to work with earlier versions) -----
+# ----- Turbo C 3.00 (can be modified to work with earlier versions) -----
 
 MODEL=l
 CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index e3a888f37..4c05ff4df 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -4,7 +4,7 @@
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 # To use, do "nmake /f scripts\makefile.vcawin32"
 
-# ---------- Microsoft Visual C++ 5.0 and later, uses assembler code ------
+# -------- Microsoft Visual C++ 5.0 and later, uses assembler code --------
 
 # Caution: the assembler code was introduced at libpng version 1.0.4 and has
 # not yet been thoroughly tested.
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 5a9691a0f..a2d8e2723 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -4,7 +4,7 @@
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 # To use, do "nmake /f scripts\makefile.vcwin32"
 
-# ---------- Microsoft Visual C++ 4.0 and later, no assembler code ------
+# -------- Microsoft Visual C++ 4.0 and later, no assembler code --------
 # If you want to use assembler code, use makefile.vcawin32 instead.
 
 CFLAGS= -Ox -GA3s -nologo -W3 -I..\zlib
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index b664b10db..9f1f20878 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,7 +5,7 @@ unit pngdef;
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.0.7rc2';
+  PNG_LIBPNG_VER_STRING = '1.0.7';
   PNG_LIBPNG_VER        =  10007;
 
 type