Imported from libpng-1.0.7.tar
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index d370574..90b178b 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 d8257af..bc7e193 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 787ce2c..eddb34c 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -31,7 +31,7 @@
 # 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 a8698d1..54005ea 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -14,7 +14,7 @@
 # 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 2b61043..acec301 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -34,7 +34,7 @@
 # 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 29b65ee..f005c5d 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@
 # 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 3512e7f..651281c 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 6a6aad9..a8ea1ee 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@
 # 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 e3fd943..82f442b 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@
 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 4d53847..5fa530f 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@
 # 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 3dfed67..21435a6 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 e3a888f..4c05ff4 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 5a9691a..a2d8e27 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 b664b10..9f1f208 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,7 +5,7 @@
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.0.7rc2';
+  PNG_LIBPNG_VER_STRING = '1.0.7';
   PNG_LIBPNG_VER        =  10007;
 
 type