diff --git a/ANNOUNCE b/ANNOUNCE
index 1b82388..cb1313a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.21rc2 - September 27, 2007
+Libpng 1.2.21rc3 - September 27, 2007
 
 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,32 +9,32 @@
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.2.21rc2.tar.gz
-   libpng-1.2.21rc2.tar.bz2
+   libpng-1.2.21rc3.tar.gz
+   libpng-1.2.21rc3.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   libpng-1.2.21rc2-no-config.tar.gz
-   libpng-1.2.21rc2-no-config.tar.bz2
+   libpng-1.2.21rc3-no-config.tar.gz
+   libpng-1.2.21rc3-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1221r02.zip
-   lp1221r02.tar.bz2
+   lp1221r03.zip
+   lp1221r03.tar.bz2
 
 Project files
 
-   libpng-1.2.21rc2-project-netware.zip
-   libpng-1.2.21rc2-project-wince.zip
+   libpng-1.2.21rc3-project-netware.zip
+   libpng-1.2.21rc3-project-wince.zip
 
 Other information:
 
-   libpng-1.2.21rc2-README.txt
-   libpng-1.2.21rc2-KNOWNBUGS.txt
-   libpng-1.2.21rc2-LICENSE.txt
-   libpng-1.2.21rc2-Y2K-compliance.txt
+   libpng-1.2.21rc3-README.txt
+   libpng-1.2.21rc3-KNOWNBUGS.txt
+   libpng-1.2.21rc3-LICENSE.txt
+   libpng-1.2.21rc3-Y2K-compliance.txt
 
 Changes since the last public release (1.2.19):
 
@@ -97,11 +97,14 @@
   Fixed potential out-of-bounds reads in png_handle_pCAL() and
     png_handle_ztXt() ("flayer" results reported by Tavis Ormandy).
 
-version 1.2.21rc2 [September 27, 2007]
+version 1.2.21rc2 [September 26, 2007]
   Fixed potential out-of-bounds reads in png_handle_sCAL(),
     png_handle_iTXt(), and png_push_read_tEXt().
   Remove some PNG_CONST declarations from pngwutil.c to avoid compiler warnings
-  Revised makefiles to update libpng.pc properly.
+  Revised makefiles to update paths in libpng.pc properly.
+
+version 1.2.21rc2 [September 27, 2007]
+  Revised makefiles to update "Libs" in libpng.pc properly.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index f274b3f..f9e1b8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1954,11 +1954,14 @@
   Fixed potential out-of-bounds reads in png_handle_pCAL() and
     png_handle_ztXt() ("flayer" results reported by Tavis Ormandy).
 
-version 1.2.21rc2 [September 27, 2007]
+version 1.2.21rc2 [September 26, 2007]
   Fixed potential out-of-bounds reads in png_handle_sCAL(),
     png_handle_iTXt(), and png_push_read_tEXt().
   Remove some PNG_CONST declarations from pngwutil.c to avoid compiler warnings
-  Revised makefiles to update libpng.pc properly.
+  Revised makefiles to update paths in libpng.pc properly.
+
+version 1.2.21rc2 [September 27, 2007]
+  Revised makefiles to update "Libs" in libpng.pc properly.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/INSTALL b/INSTALL
index ca86699..ff971d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.2.21rc2 - September 27, 2007
+Installing libpng version 1.2.21rc3 - September 27, 2007
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -44,7 +44,7 @@
 correspond to the version of zlib that's installed.
 
 You can rename the directories that you downloaded (they
-might be called "libpng-1.2.21rc2" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.21rc3" 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 @@
  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.21rc2)
+                       gcc, creates libpng12.so.0.1.2.21rc3)
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.21rc2)
+                       (gcc, creates libpng12.so.0.1.2.21rc3)
  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 @@
  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.21rc2)
+                       creates libpng12.so.0.1.2.21rc3)
  makefile.sunos    =>  Sun makefile
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.21rc2)
+                       creates libpng12.so.0.1.2.21rc3)
  makefile.solaris-x86 =>  Solaris/intelMMX 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.21rc2)
+                       creates libpng12.so.0.1.2.21rc3)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.21rc2)
+                       creates libpng12.so.0.1.2.21rc3)
  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 ee49c53..3f2cc42 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
 
-Known bugs in libpng version 1.2.21rc2
+Known bugs in libpng version 1.2.21rc3
 
 1. February 23, 2006: The custom makefiles don't build libpng with -lz.
 
diff --git a/LICENSE b/LICENSE
index 269ffd8..8be5d79 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,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.21rc2, September 27, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.21rc3, September 27, 2007, are
 Copyright (c) 2004, 2006-2007 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
diff --git a/README b/README
index ce3ffa2..7a4ee68 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.21rc2 - September 27, 2007 (shared library 12.0)
+README for libpng version 1.2.21rc3 - September 27, 2007 (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.
@@ -190,11 +190,11 @@
        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.21rc2)
+                            gcc, creates libpng12.so.0.1.2.21rc3)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.21rc2)
+                            (gcc, creates libpng12.so.0.1.2.21rc3)
        makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.21rc2,
+                            (gcc, creates libpng12.so.0.1.2.21rc3,
                             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
@@ -216,12 +216,12 @@
        makefile.openbsd =>  OpenBSD makefile
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
        makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng12.so.0.1.2.21rc2)
+                            (gcc, creates libpng12.so.0.1.2.21rc3)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng12.so.0.1.2.21rc2)
+                            (gcc, creates libpng12.so.0.1.2.21rc3)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng12.so.0.1.2.21rc2)
+                            (gcc, creates libpng12.so.0.1.2.21rc3)
        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 cd09d21..23d0271 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -7,7 +7,7 @@
       an official declaration.
 
       This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.2.21rc2 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.21rc3 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 ab81a05..ad4b558 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.61 for libpng 1.2.21rc2.
+# Generated by GNU Autoconf 2.61 for libpng 1.2.21rc3.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -728,8 +728,8 @@
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.21rc2'
-PACKAGE_STRING='libpng 1.2.21rc2'
+PACKAGE_VERSION='1.2.21rc3'
+PACKAGE_STRING='libpng 1.2.21rc3'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 
 ac_unique_file="pngget.c"
@@ -1405,7 +1405,7 @@
   # 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.21rc2 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.21rc3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.2.21rc2:";;
+     short | recursive ) echo "Configuration of libpng 1.2.21rc3:";;
    esac
   cat <<\_ACEOF
 
@@ -1585,7 +1585,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.2.21rc2
+libpng configure 1.2.21rc3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@
 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.21rc2, which was
+It was created by libpng $as_me 1.2.21rc3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2269,7 +2269,7 @@
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.2.21rc2'
+ VERSION='1.2.21rc3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2440,7 +2440,7 @@
 
 
 
-PNGLIB_VERSION=1.2.21rc2
+PNGLIB_VERSION=1.2.21rc3
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=21
@@ -21282,7 +21282,7 @@
 # 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.21rc2, which was
+This file was extended by libpng $as_me 1.2.21rc3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21335,7 +21335,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libpng config.status 1.2.21rc2
+libpng config.status 1.2.21rc3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index bde9036..c744c5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.2.21rc2], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.21rc3], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.2.21rc2
+PNGLIB_VERSION=1.2.21rc3
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=2
 PNGLIB_RELEASE=21
diff --git a/libpng-1.2.21rc2.txt b/libpng-1.2.21rc3.txt
similarity index 99%
rename from libpng-1.2.21rc2.txt
rename to libpng-1.2.21rc3.txt
index df305b5..ba94218 100644
--- a/libpng-1.2.21rc2.txt
+++ b/libpng-1.2.21rc3.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.21rc2 - September 27, 2007
+ libpng version 1.2.21rc3 - September 27, 2007
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -2802,7 +2802,7 @@
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.21rc2 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.21rc3 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 8b96c38..9452701 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
 .TH LIBPNG 3 "September 27, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21rc3
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -410,7 +410,7 @@
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.21rc2 - September 27, 2007
+ libpng version 1.2.21rc3 - September 27, 2007
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2007 Glenn Randers-Pehrson
@@ -3212,7 +3212,7 @@
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.21rc2 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.21rc3 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
@@ -3412,7 +3412,7 @@
  1.0.28              10    10028  10.so.0.28[.0]
  1.2.20              13    10220  12.so.0.20[.0]
  1.2.21beta1-2       13    10221  12.so.0.21[.0]
- 1.2.21rc1-2         13    10221  12.so.0.21[.0]
+ 1.2.21rc1-3         13    10221  12.so.0.21[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3468,7 +3468,7 @@
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.2.21rc2 - September 27, 2007:
+Libpng version 1.2.21rc3 - September 27, 2007:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -3489,7 +3489,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.21rc2, September 27, 2007, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.21rc3, September 27, 2007, are
 Copyright (c) 2004,2006-2007 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
diff --git a/libpngpf.3 b/libpngpf.3
index cdc0724..393f55d 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
 .TH LIBPNGPF 3 "September 27, 2007"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21rc2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.21rc3
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/png.c b/png.c
index bcf2054..049c407 100644
--- a/png.c
+++ b/png.c
@@ -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_21rc2 Your_png_h_is_not_version_1_2_21rc2;
+typedef version_1_2_21rc3 Your_png_h_is_not_version_1_2_21rc3;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
@@ -693,7 +693,7 @@
 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.21rc2 - September 27, 2007\n\
+   return ((png_charp) "\n libpng version 1.2.21rc3 - September 27, 2007\n\
    Copyright (c) 1998-2007 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 03cad17..c7c6cc1 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.2.21rc2 - September 27, 2007
+ * libpng version 1.2.21rc3 - September 27, 2007
  * Copyright (c) 1998-2007 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.2.21rc2 - September 27, 2007: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.21rc3 - September 27, 2007: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -161,7 +161,7 @@
  *    1.0.28                  10    10028  10.so.0.28[.0]
  *    1.2.20                  13    10220  12.so.0.20[.0]
  *    1.2.21beta1-2           13    10221  12.so.0.21[.0]
- *    1.2.21rc1-2             13    10221  12.so.0.21[.0]
+ *    1.2.21rc1-3             13    10221  12.so.0.21[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -191,7 +191,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.21rc2, September 27, 2007, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.21rc3, September 27, 2007, are
  * Copyright (c) 2004, 2006-2007 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:
@@ -309,7 +309,7 @@
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.21rc2 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.21rc3 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
@@ -365,9 +365,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.21rc2"
+#define PNG_LIBPNG_VER_STRING "1.2.21rc3"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.21rc2 - September 27, 2007\n"
+   " libpng version 1.2.21rc3 - September 27, 2007\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -379,7 +379,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  3
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1414,7 +1414,7 @@
 /* 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_21rc2;
+typedef png_structp version_1_2_21rc3;
 
 typedef png_struct FAR * FAR * png_structpp;
 
diff --git a/pngconf.h b/pngconf.h
index fd9799f..5c9b783 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.2.21rc2 - September 27, 2007
+ * libpng version 1.2.21rc3 - September 27, 2007
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2007 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 5767d58..3db618a 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1548,4 +1548,4 @@
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_21rc2 your_png_h_is_not_version_1_2_21rc2;
+typedef version_1_2_21rc3 your_png_h_is_not_version_1_2_21rc3;
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4fb4bde..2f986dd 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -169,7 +169,7 @@
 
 # SET UP LINKS
 set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#    VERSION 0.${PNGLIB_RELEASE}.1.2.21rc2
+#    VERSION 0.${PNGLIB_RELEASE}.1.2.21rc3
      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 133372e..e8895ce 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.21rc2
+version=1.2.21rc3
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index b35105b..9d5e5db 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.21rc2
+Version: 1.2.21rc3
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir} @LIBPNG_NO_MMX@
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 79b6538..2a579dc 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.21rc2
+Version: 1.2.21rc3
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 6387330..e5e1c5d 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -91,7 +91,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 9f79a13..f297633 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -91,7 +91,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index d11830d..d369d23 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index cecf373..c7a68c3 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -87,7 +87,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index e90aefc..c85c2e8 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll
@@ -138,7 +138,7 @@
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s/-lm// > libpng.pc
+	-e s!-lpng12!-lpng12\ -lz! > libpng.pc
 
 libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
 	@echo -e Making $(LIBNAME) libpng-config file for this libpng \
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 481133d..251c3f4 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -84,7 +84,7 @@
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lm!! > libpng.pc
+	-e s!-lpng12!-lpng12\ -lz! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 89b6c8f..04a8331 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -71,7 +71,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index a6db678..cb13215 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -102,7 +102,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng.syms: png.h pngconf.h
 	$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 15bff32..203bf69 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -115,7 +115,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 4b8f3b3..c63c9e5 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -89,7 +89,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index d084fe8..f523970 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -99,7 +99,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 68aa1a9..efbb48e 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -86,7 +86,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 21fa364..7d7b40f 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -94,7 +94,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 58977c9..dc65301 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=libpng$(MINGDLL).dll
@@ -134,7 +134,8 @@
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lm!! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
 	@echo -e Making $(LIBNAME) libpng-config file for this libpng \
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 17e32fb..497ddc6 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.21rc2
+SHLIB_MINOR=	1.2.21rc3
 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 b70925a..b86f14b 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.21rc2
+SHLIB_MINOR=	1.2.21rc3
 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 ef4ead5..c7c8965 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -96,7 +96,9 @@
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e "s!Cflags: !Cflags: -DPNG_NO_MMX_CODE !"> libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! \
+	-e s!Cflags: !Cflags:\ -DPNG_NO_MMX_CODE!> libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index eee2f7e..9f05b62 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.21rc2
+SHLIB_MINOR=	1.2.21rc3
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 9f3848e..98209e6 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -82,7 +82,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 6d56a5b..c4d0ce8 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -89,7 +89,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index d779f6a..03b9582 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -92,7 +92,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 027291e..fde8d6f 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -92,7 +92,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 333f0cb..7d5aa55 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -89,7 +89,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 7491a9c..0ea0897 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.21rc2
+PNGMIN = 1.2.21rc3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -88,7 +88,8 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! > libpng.pc
+	-e s!@includedir@!$(INCPATH)! \
+	-e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 679afed..8a65dc5 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.21rc2
+; Version 1.2.21rc3
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 9831c79..bdd965b 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.2.21rc2
+;Version 1.2.21rc3
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3