diff -ru4NwbB libpng-1.4.12/configure.ac libpng-1.4.13rc02/configure.ac
--- libpng-1.4.12/configure.ac	2012-07-09 19:38:27.680297736 -0500
+++ libpng-1.4.13rc02/configure.ac	2014-01-30 15:26:55.366276583 -0600
@@ -30,9 +30,9 @@
 
 dnl End of version number stuff
 
 AC_CONFIG_SRCDIR([pngget.c])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LD
diff -ru4NwbB libpng-1.4.12/contrib/gregbook/readpng.c libpng-1.4.13rc02/contrib/gregbook/readpng.c
--- libpng-1.4.12/contrib/gregbook/readpng.c	2012-07-09 19:38:21.865278567 -0500
+++ libpng-1.4.13rc02/contrib/gregbook/readpng.c	2014-01-30 15:26:47.899392933 -0600
@@ -213,8 +213,12 @@
     /* setjmp() must be called in every function that calls a PNG-reading
      * libpng function */
 
     if (setjmp(png_jmpbuf(png_ptr))) {
+        free(image_data);
+        image_data = NULL;
+        free(row_pointers);
+        row_pointers = NULL;
         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
         return NULL;
     }
 
diff -ru4NwbB libpng-1.4.12/contrib/pngminim/encoder/README libpng-1.4.13rc02/contrib/pngminim/encoder/README
--- libpng-1.4.12/contrib/pngminim/encoder/README	2012-07-09 19:38:22.457063684 -0500
+++ libpng-1.4.13rc02/contrib/pngminim/encoder/README	2014-01-30 15:26:48.615145803 -0600
@@ -1,9 +1,10 @@
 This demonstrates the use of PNG_USER_CONFIG and pngusr.h
 
-To build a minimal write-only decoder with embedded libpng and zlib, run
+The makefile builds a minimal write-only encoder with embedded libpng
+and zlib.
 
-    gather.sh  # to collect needed files from pngminus, libpng, and zlib
-    make
+Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
+on the make command line.
  
 If you prefer to use the shared libraries, go to contrib/pngminus
 and build the pnm2png application there. 
diff -ru4NwbB libpng-1.4.12/png.c libpng-1.4.13rc02/png.c
--- libpng-1.4.12/png.c	2012-07-09 19:38:21.598956834 -0500
+++ libpng-1.4.13rc02/png.c	2014-01-30 15:26:47.567856256 -0600
@@ -822,16 +822,8 @@
       png_warning(png_ptr, "Invalid image height in IHDR");
       error = 1;
    }
 
-   if ( width > (PNG_UINT_32_MAX
-                 >> 3)      /* 8-byte RGBA pixels */
-                 - 64       /* bigrowbuf hack */
-                 - 1        /* filter byte */
-                 - 7*8      /* rounding of width to multiple of 8 pixels */
-                 - 8)       /* extra max_pixel_depth pad */
-      png_warning(png_ptr, "Width is too large for libpng to process pixels");
-
    /* Check other values */
    if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
        bit_depth != 8 && bit_depth != 16)
    {
diff -ru4NwbB libpng-1.4.12/png.h libpng-1.4.13rc02/png.h
--- libpng-1.4.12/png.h	2012-07-09 19:38:21.563699618 -0500
+++ libpng-1.4.13rc02/png.h	2014-01-30 15:26:47.532734451 -0600
@@ -169,8 +169,10 @@
  *    1.4.10                  14    10410  14.so.14.10[.0]
  *    1.4.11rc01              14    10411  14.so.14.11[.0]
  *    1.4.11                  14    10411  14.so.14.11[.0]
  *    1.4.12                  14    10412  14.so.14.12[.0]
+ *    1.4.13beta01-06         14    10413  14.so.14.13[.0]
+ *    1.4.13rc01-02           14    10413  14.so.14.13[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
  *    used for changes in backward compatibility, as it is intended.  The
@@ -201,9 +203,9 @@
  *
  * This code is released under the libpng license.
  *
  * libpng versions 1.2.6, August 15, 2004, through 1.4.13rc02, January 30, 2014, are
- * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
+ * Copyright (c) 2004, 2006-2013 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:
  *
  *    Cosmin Truta
diff -ru4NwbB libpng-1.4.12/pngconf.h libpng-1.4.13rc02/pngconf.h
--- libpng-1.4.12/pngconf.h	2012-07-09 19:38:21.573644597 -0500
+++ libpng-1.4.13rc02/pngconf.h	2014-01-30 15:26:47.542625521 -0600
@@ -745,9 +745,9 @@
 /* Added at libpng-1.2.43.  To accept all valid PNGs no matter
  * how large, set these two limits to 0.
  */
 #ifndef PNG_USER_CHUNK_CACHE_MAX
-#  define PNG_USER_CHUNK_CACHE_MAX 0
+#  define PNG_USER_CHUNK_CACHE_MAX 32767
 #endif
 
 /* Added at libpng-1.2.43 */
 #ifndef PNG_USER_CHUNK_MALLOC_MAX
@@ -1388,31 +1388,25 @@
 #    endif
 #    ifndef PNG_NORETURN
 #      define PNG_NORETURN   __attribute__((__noreturn__))
 #    endif
+#    if __GNUC__ >= 3
 #    ifndef PNG_ALLOCATED
 #      define PNG_ALLOCATED  __attribute__((__malloc__))
 #    endif
 #    ifndef PNG_DEPRECATED
 #      define PNG_DEPRECATED __attribute__((__deprecated__))
 #    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNG_DEPSTRUCT
-#      define PNG_DEPSTRUCT  __attribute__((__deprecated__))
-#    endif
 #    ifndef PNG_PRIVATE
 #      if 0 /* Doesn't work so we use deprecated instead*/
 #        define PNG_PRIVATE \
           __attribute__((warning("This function is not exported by libpng.")))
 #      else
 #        define PNG_PRIVATE \
           __attribute__((__deprecated__))
 #      endif
-#    endif /* PNG_PRIVATE */
+#      endif
+#    endif /*  __GNUC__ >= 3 */
 #  endif /* __GNUC__ */
 #endif /* PNG_PEDANTIC_WARNINGS */
 
 #ifndef PNG_DEPRECATED
diff -ru4NwbB libpng-1.4.12/pngpriv.h libpng-1.4.13rc02/pngpriv.h
--- libpng-1.4.12/pngpriv.h	2012-07-09 19:38:21.582231997 -0500
+++ libpng-1.4.13rc02/pngpriv.h	2014-01-30 15:26:47.551196910 -0600
@@ -2,9 +2,9 @@
 /* pngpriv.h - private declarations for use inside libpng
  *
  * libpng version 1.4.13rc02 - January 30, 2014
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2014 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.)
  *
  * This code is released under the libpng license.
diff -ru4NwbB libpng-1.4.12/pngread.c libpng-1.4.13rc02/pngread.c
--- libpng-1.4.12/pngread.c	2012-07-09 19:38:21.639652435 -0500
+++ libpng-1.4.13rc02/pngread.c	2014-01-30 15:26:47.608255440 -0600
@@ -1,9 +1,9 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.4.10 [March 8, 2012]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.13 [%RDATE%]
+ * Copyright (c) 1998-2014 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.)
  *
  * This code is released under the libpng license.
@@ -1231,9 +1231,9 @@
     */
    if (transforms & PNG_TRANSFORM_EXPAND)
       if ((png_ptr->bit_depth < 8) ||
           (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-          (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+          (info_ptr->valid & PNG_INFO_tRNS))
          png_set_expand(png_ptr);
 #endif
 
    /* We don't handle background color or gamma transformation or quantizing.
@@ -1250,16 +1250,10 @@
    /* If you want to shift the pixel values from the range [0,255] or
     * [0,65535] to the original [0,7] or [0,31], or whatever range the
     * colors were originally in:
     */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
-   {
-      png_color_8p sig_bit;
-
-      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-      png_set_shift(png_ptr, sig_bit);
-   }
+   if ((transforms & PNG_TRANSFORM_SHIFT) && (info_ptr->valid & PNG_INFO_sBIT))
+      png_set_shift(png_ptr, &info_ptr->sig_bit);
 #endif
 
 #ifdef PNG_READ_BGR_SUPPORTED
    /* Flip the RGB pixels to BGR (or RGBA to BGRA)
diff -ru4NwbB libpng-1.4.12/pngrtran.c libpng-1.4.13rc02/pngrtran.c
--- libpng-1.4.12/pngrtran.c	2012-07-09 19:38:21.662920301 -0500
+++ libpng-1.4.13rc02/pngrtran.c	2014-01-30 15:26:47.631356497 -0600
@@ -1,9 +1,9 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.4.11 [March 29, 2012]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.13 [January 30, 2014]
+ * Copyright (c) 1998-2014 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.)
  *
  * This code is released under the libpng license.
@@ -909,9 +909,12 @@
     k=0;
     for (i=0; i<png_ptr->num_trans; i++)
     {
       if (png_ptr->trans_alpha[i] != 0 && png_ptr->trans_alpha[i] != 0xff)
+      {
         k=1; /* Partial transparency is present */
+        break;
+      }
     }
     if (k == 0)
       png_ptr->transformations &= ~PNG_GAMMA;
    }
diff -ru4NwbB libpng-1.4.12/pngset.c libpng-1.4.13rc02/pngset.c
--- libpng-1.4.12/pngset.c	2012-07-09 19:38:21.687333269 -0500
+++ libpng-1.4.13rc02/pngset.c	2014-01-30 15:26:47.655977991 -0600
@@ -1,9 +1,9 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.4.11 [March 29, 2012]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.13 [January 30, 2014]
+ * Copyright (c) 1998-2014 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.)
  *
  * This code is released under the libpng license.
@@ -249,17 +249,8 @@
    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
       info_ptr->channels++;
    info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
 
-   /* Check for potential overflow */
-   if (width > (PNG_UINT_32_MAX
-                 >> 3)      /* 8-byte RGBA pixels */
-                 - 64       /* bigrowbuf hack */
-                 - 1        /* filter byte */
-                 - 7*8      /* rounding of width to multiple of 8 pixels */
-                 - 8)       /* extra max_pixel_depth pad */
-      info_ptr->rowbytes = 0;
-   else
       info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
 }
 
 #ifdef PNG_oFFs_SUPPORTED
@@ -538,16 +529,21 @@
 #endif
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
    int_white_x = 31270L;
    int_white_y = 32900L;
    int_red_x   = 64000L;
    int_red_y   = 33000L;
    int_green_x = 30000L;
    int_green_y = 60000L;
    int_blue_x  = 15000L;
    int_blue_y  =  6000L;
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+       int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+       int_green_y, int_blue_x, int_blue_y);
+#  endif
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
    white_x = (float).3127;
    white_y = (float).3290;
@@ -556,16 +552,8 @@
    green_x = (float).30;
    green_y = (float).60;
    blue_x  = (float).15;
    blue_y  = (float).06;
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-       int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
-       int_green_y, int_blue_x, int_blue_y);
-#endif
-#ifdef PNG_FLOATING_POINT_SUPPORTED
    png_set_cHRM(png_ptr, info_ptr,
        white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
 #endif
 #endif /* cHRM */
@@ -835,8 +823,14 @@
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
+   if (num_trans < 0 || num_trans > PNG_MAX_PALETTE_LENGTH)
+      {
+        png_warning(png_ptr, "Ignoring invalid num_trans value");
+        return;
+      }
+
    if (trans_alpha != NULL)
    {
        /* It may not actually be necessary to set png_ptr->trans_alpha here;
         * we do it for backward compatibility with the way the png_handle_tRNS
diff -ru4NwbB libpng-1.4.12/scripts/libpng.pc.in libpng-1.4.13rc02/scripts/libpng.pc.in
--- libpng-1.4.12/scripts/libpng.pc.in	2012-07-09 19:38:23.346833358 -0500
+++ libpng-1.4.13rc02/scripts/libpng.pc.in	2014-01-30 15:26:49.782864877 -0600
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/libpng%N%
+includedir=@includedir@/libpng%NN%
 
 Name: libpng
 Description: Loads and saves PNG files
 Version: 1.4.13rc02
-Libs: -L${libdir} -lpng%N%
+Libs: -L${libdir} -lpng%NN%
 Cflags: -I${includedir}
diff -ru4NwbB libpng-1.4.12/scripts/list libpng-1.4.13rc02/scripts/list
--- libpng-1.4.12/scripts/list	1969-12-31 18:00:00.000000000 -0600
+++ libpng-1.4.13rc02/scripts/list	2014-01-15 12:24:04.999261000 -0600
@@ -0,0 +1,17 @@
+makefile.solaris-x86
+makefile.solaris
+makefile.so9
+makefile.sgi
+makefile.sggcc
+makefile.sco
+makefile.linux
+makefile.hpux
+makefile.hpgcc
+makefile.hp64
+makefile.elf
+makefile.dec
+makefile.cygwin
+makefile.beos
+makefile.aix
+makefile.64sunu
+makefile.32sunu
diff -ru4NwbB libpng-1.4.12/scripts/makefile.32sunu libpng-1.4.13rc02/scripts/makefile.32sunu
--- libpng-1.4.12/scripts/makefile.32sunu	2012-07-09 19:38:23.357885997 -0500
+++ libpng-1.4.13rc02/scripts/makefile.32sunu	2014-01-30 15:26:49.793839593 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -28,9 +28,9 @@
 
 SUN_CC_FLAGS=-fast -xtarget=ultra
 SUN_LD_FLAGS=-fast -xtarget=ultra
 
-# where make install puts libpng.a, libpng%N%.so and libpng%N%/png.h
+# where make install puts libpng.a, libpng%NN%.so and libpng%NN%/png.h
 prefix=/a
 exec_prefix=$(prefix)
 
 # Where the zlib library and include files are located
@@ -90,9 +90,9 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
@@ -101,9 +101,9 @@
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
 	echo ccopts=\"-xtarget=ultra\"; \
 	echo ldopts=\"-xtarget=ultra\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.64sunu libpng-1.4.13rc02/scripts/makefile.64sunu
--- libpng-1.4.12/scripts/makefile.64sunu	2012-07-09 19:38:23.368879462 -0500
+++ libpng-1.4.13rc02/scripts/makefile.64sunu	2014-01-30 15:26:49.805087872 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -28,9 +28,9 @@
 
 SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
 
-# where make install puts libpng.a, libpng%N%.so and libpng%N%/png.h
+# where make install puts libpng.a, libpng%NN%.so and libpng%NN%/png.h
 prefix=/a
 exec_prefix=$(prefix)
 
 # Where the zlib library and include files are located
@@ -46,9 +46,9 @@
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -90,9 +90,9 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
@@ -101,9 +101,9 @@
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
 	echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
 	echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.aix libpng-1.4.13rc02/scripts/makefile.aix
--- libpng-1.4.12/scripts/makefile.aix	2012-07-09 19:38:23.378843837 -0500
+++ libpng-1.4.13rc02/scripts/makefile.aix	2014-01-30 15:26:49.815054120 -0600
@@ -20,9 +20,9 @@
 RANLIB = ranlib
 RM_F = rm -f
 LN_SF = ln -f -s
 
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 prefix=/usr/local
 INCPATH=$(prefix)/include
@@ -46,9 +46,9 @@
 CRELEASE = -O2
 LDRELEASE = -s
 WARNMORE=-W -Wall
 CFLAGS = -D_ALL_SOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng%N% -lz -lm $(LDRELEASE)
+LDFLAGS = -L. -L$(ZLIBLIB) -lpng%NN% -lz -lm $(LDRELEASE)
 
 # File extensions
 O=.o
 A=.a
diff -ru4NwbB libpng-1.4.12/scripts/makefile.beos libpng-1.4.13rc02/scripts/makefile.beos
--- libpng-1.4.12/scripts/makefile.beos	2012-07-09 19:38:23.399451875 -0500
+++ libpng-1.4.13rc02/scripts/makefile.beos	2014-01-30 15:26:49.835851964 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -44,9 +44,9 @@
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
 LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz
 
-# where make install puts libpng.a, libpng%N%.so*, and png.h
+# where make install puts libpng.a, libpng%NN%.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -86,15 +86,15 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo libs=\"-lpng%N% -lz \"; \
+	echo libs=\"-lpng%NN% -lz \"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
@@ -105,9 +105,9 @@
 	$(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \
 	$(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
 
 pngtest: pngtest.o $(LIBSO)
-	$(CC) -L$(ZLIBLIB) -L. -lz -lpng%N% -o pngtest pngtest.o
+	$(CC) -L$(ZLIBLIB) -L. -lz -lpng%NN% -o pngtest pngtest.o
 
 test: pngtest
 	./pngtest
 
diff -ru4NwbB libpng-1.4.12/scripts/makefile.cygwin libpng-1.4.13rc02/scripts/makefile.cygwin
--- libpng-1.4.12/scripts/makefile.cygwin	2012-07-09 19:38:23.430697910 -0500
+++ libpng-1.4.13rc02/scripts/makefile.cygwin	2014-01-30 15:26:49.867583296 -0600
@@ -64,11 +64,11 @@
 CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
         -W -Wall -O3 $(ALIGN) -funroll-loops \
 	-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
 
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
-CYGDLL = %N%
+CYGDLL = %NN%
 
 SHAREDLIB=cygpng$(CYGDLL).dll
 STATLIB=libpng.a
 IMPLIB=libpng.dll.a
@@ -242,18 +242,18 @@
 test-dd:
 	echo
 	echo Testing installed dynamic shared library in $(DL).
 	$(CC) -I$(DI) $(CFLAGS) \
-	   `$(BINPATH)/libpng%N%-config --cflags` pngtest.c \
+	   `$(BINPATH)/libpng%NN%-config --cflags` pngtest.c \
 	   -L$(DL) -L$(ZLIBLIB) \
-	   -o pngtestd `$(BINPATH)/libpng%N%-config --ldflags`
+	   -o pngtestd `$(BINPATH)/libpng%NN%-config --ldflags`
 	./pngtestd pngtest.png
 
 test-installed:
 	$(CC) $(CFLAGS) \
-	   `$(BINPATH)/libpng%N%-config --cflags` pngtest.c \
+	   `$(BINPATH)/libpng%NN%-config --cflags` pngtest.c \
 	   -L$(ZLIBLIB) \
-	   -o pngtesti$(EXE) `$(BINPATH)/libpng%N%-config --ldflags`
+	   -o pngtesti$(EXE) `$(BINPATH)/libpng%NN%-config --ldflags`
 	./pngtesti$(EXE) pngtest.png
 
 clean:
 	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
diff -ru4NwbB libpng-1.4.12/scripts/makefile.dec libpng-1.4.13rc02/scripts/makefile.dec
--- libpng-1.4.12/scripts/makefile.dec	2012-07-09 19:38:23.452175049 -0500
+++ libpng-1.4.13rc02/scripts/makefile.dec	2014-01-30 15:26:49.888890025 -0600
@@ -7,9 +7,9 @@
 # and license in png.h
 
 # Library name:
 PNGMAJ = %SONUM%
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
@@ -70,17 +70,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-std\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.elf libpng-1.4.13rc02/scripts/makefile.elf
--- libpng-1.4.12/scripts/makefile.elf	2012-07-09 19:38:23.472719583 -0500
+++ libpng-1.4.13rc02/scripts/makefile.elf	2014-01-30 15:26:49.909409869 -0600
@@ -1,5 +1,5 @@
-# makefile for libpng.a and libpng%N%.so on Linux ELF with gcc
+# makefile for libpng.a and libpng%NN%.so on Linux ELF with gcc
 # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs
 # and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
@@ -13,9 +13,9 @@
 #    * $(OLDSO).%OLDNUM% is a symlink rather than a different library
 #    * versioned symbols
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -31,10 +31,10 @@
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
-# where "make install" puts libpng%N%.a, libpng%N%.so*,
-# libpng%N%/png.h and libpng%N%/pngconf.h
+# where "make install" puts libpng%NN%.a, libpng%NN%.so*,
+# libpng%NN%/png.h and libpng%NN%/pngconf.h
 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)
 
@@ -56,9 +56,9 @@
 
 CFLAGS=-W -Wall -D_REENTRANT -O2 \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
-LDFLAGS=-L. -lpng%N%
+LDFLAGS=-L. -lpng%NN%
 LDFLAGS_A=libpng.a -lz -lm
 LIBADDFLAGS=-lz -lm
 
 
@@ -103,13 +103,13 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng.syms: png.h pngconf.h
 	$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
-	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG%N%_%s {global:\n",PNGMAJ)}\
+	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG%NN%_%s {global:\n",PNGMAJ)}\
 	{ for (i=1;i+2<=NF;++i)\
 		if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
 			print $$(i+1) ";";\
 	for (i=1;i+1<=NF;++i)\
@@ -124,10 +124,10 @@
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"\"; \
 	echo R_opts=\"\"; \
-	echo libs=\"-lpng%N%\"; \
-	echo all_libs=\"-lpng%N% $(LIBADDFLAGS)\"; \
+	echo libs=\"-lpng%NN%\"; \
+	echo all_libs=\"-lpng%NN% $(LIBADDFLAGS)\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.hp64 libpng-1.4.13rc02/scripts/makefile.hp64
--- libpng-1.4.12/scripts/makefile.hp64	2012-07-09 19:38:23.503850556 -0500
+++ libpng-1.4.13rc02/scripts/makefile.hp64	2014-01-30 15:26:49.943399535 -0600
@@ -18,9 +18,9 @@
 #   LDSHARED=ld -b
 #   SHAREDLIB=libz.sl
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -43,9 +43,9 @@
 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP
 
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 
-# where make install puts libpng.a, libpng%N%.sl, and png.h
+# where make install puts libpng.a, libpng%NN%.sl, and png.h
 prefix=/opt/libpng
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -88,17 +88,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.hpgcc libpng-1.4.13rc02/scripts/makefile.hpgcc
--- libpng-1.4.12/scripts/makefile.hpgcc	2012-07-09 19:38:23.514740057 -0500
+++ libpng-1.4.13rc02/scripts/makefile.hpgcc	2014-01-30 15:26:49.960160921 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -53,10 +53,10 @@
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng%N% -lz -lm
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz -lm
+#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng%NN% -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -98,15 +98,15 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.hpux libpng-1.4.13rc02/scripts/makefile.hpux
--- libpng-1.4.12/scripts/makefile.hpux	2012-07-09 19:38:23.525462324 -0500
+++ libpng-1.4.13rc02/scripts/makefile.hpux	2014-01-30 15:26:49.970602171 -0600
@@ -18,9 +18,9 @@
 #   LDSHARED=ld -b
 #   SHAREDLIB=libz.sl
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -35,9 +35,9 @@
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
-# where make install puts libpng.a, libpng%N%.sl, and png.h
+# where make install puts libpng.a, libpng%NN%.sl, and png.h
 prefix=/opt/libpng
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -85,17 +85,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.linux libpng-1.4.13rc02/scripts/makefile.linux
--- libpng-1.4.12/scripts/makefile.linux	2012-07-09 19:38:23.565373506 -0500
+++ libpng-1.4.13rc02/scripts/makefile.linux	2014-01-30 15:26:50.009556935 -0600
@@ -1,5 +1,5 @@
-# makefile for libpng.a and libpng%N%.so on Linux ELF with gcc
+# makefile for libpng.a and libpng%NN%.so on Linux ELF with gcc
 # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
@@ -7,9 +7,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 RELEASE = %RELEASE%
 
 # Shared library names:
@@ -25,10 +25,10 @@
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
-# where "make install" puts libpng%N%.a, libpng%N%.so*,
-# libpng%N%/png.h and libpng%N%/pngconf.h
+# where "make install" puts libpng%NN%.a, libpng%NN%.so*,
+# libpng%NN%/png.h and libpng%NN%/pngconf.h
 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)
 
@@ -50,9 +50,9 @@
 
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng%NN% -lz -lm
 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -95,17 +95,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.sco libpng-1.4.13rc02/scripts/makefile.sco
--- libpng-1.4.12/scripts/makefile.sco	2012-07-09 19:38:23.646745971 -0500
+++ libpng-1.4.13rc02/scripts/makefile.sco	2014-01-30 15:26:50.087295641 -0600
@@ -9,9 +9,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -37,9 +37,9 @@
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CFLAGS= -dy -belf -I$(ZLIBINC) -O3
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -81,17 +81,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-belf\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.sggcc libpng-1.4.13rc02/scripts/makefile.sggcc
--- libpng-1.4.12/scripts/makefile.sggcc	2012-07-09 19:38:23.657964337 -0500
+++ libpng-1.4.13rc02/scripts/makefile.sggcc	2014-01-30 15:26:50.097673342 -0600
@@ -1,14 +1,14 @@
-# makefile for libpng.a and libpng%N%.so, SGI IRIX with 'cc'
+# makefile for libpng.a and libpng%NN%.so, SGI IRIX with 'cc'
 # Copyright (C) 2001-2002, 2006, 2010 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -23,9 +23,9 @@
 LN_SF=ln -sf
 RANLIB=echo
 RM_F=/bin/rm -f
 
-# Where make install puts libpng.a, libpng%N%.so, and libpng%N%/png.h
+# Where make install puts libpng.a, libpng%NN%.so, and libpng%NN%/png.h
 # Prefix must be a full pathname.
 
 prefix=/usr/local
 exec_prefix=$(prefix)
@@ -86,9 +86,9 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
@@ -97,9 +97,9 @@
 	echo cppflags=\"\"; \
 	echo ldopts=\"$(ABI)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo libdir=\"$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.sgi libpng-1.4.13rc02/scripts/makefile.sgi
--- libpng-1.4.12/scripts/makefile.sgi	2012-07-09 19:38:23.668906066 -0500
+++ libpng-1.4.13rc02/scripts/makefile.sgi	2014-01-30 15:26:50.108312843 -0600
@@ -1,14 +1,14 @@
-# makefile for libpng.a and libpng%N%.so, SGI IRIX with 'cc'
+# makefile for libpng.a and libpng%NN%.so, SGI IRIX with 'cc'
 # Copyright (C) 2001-2002, 2006, 2007, 2010 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME=libpng%N%
+LIBNAME=libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -23,9 +23,9 @@
 LN_SF=ln -sf
 RANLIB=echo
 RM_F=/bin/rm -f
 
-# Where make install puts libpng.a, libpng%N%.so, and libpng%N%/png.h
+# Where make install puts libpng.a, libpng%NN%.so, and libpng%NN%/png.h
 # Prefix must be a full pathname.
 
 prefix=/usr/local
 exec_prefix=$(prefix)
@@ -45,9 +45,9 @@
 WARNMORE=-fullwarn
 # Note: -KPIC is the default anyhow
 #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
 CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng%NN% -lz -lm
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
   -set_version sgi$(PNGMAJ).0
 # See "man dso" for info about shared objects
@@ -87,9 +87,9 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
@@ -97,9 +97,9 @@
 	echo ccopts=\"$(ABI)\"; \
 	echo ldopts=\"$(ABI)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo libdir=\"$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.so9 libpng-1.4.13rc02/scripts/makefile.so9
--- libpng-1.4.12/scripts/makefile.so9	2012-07-09 19:38:23.679921148 -0500
+++ libpng-1.4.13rc02/scripts/makefile.so9	2014-01-30 15:26:50.118818451 -0600
@@ -10,9 +10,9 @@
 # and license in png.h
 
 # Library name:
 PNGMAJ = %SONUM%
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
@@ -47,9 +47,9 @@
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 #CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
 CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -91,17 +91,17 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.solaris libpng-1.4.13rc02/scripts/makefile.solaris
--- libpng-1.4.12/scripts/makefile.solaris	2012-07-09 19:38:23.690939315 -0500
+++ libpng-1.4.13rc02/scripts/makefile.solaris	2014-01-30 15:26:50.129450530 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -25,9 +25,9 @@
 LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f
 
-# Where make install puts libpng.a, libpng%N%.so*, and png.h
+# Where make install puts libpng.a, libpng%NN%.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)
 
 # Where the zlib library and include files are located
@@ -43,9 +43,9 @@
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -87,18 +87,18 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo cppflags=\"\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
diff -ru4NwbB libpng-1.4.12/scripts/makefile.solaris-x86 libpng-1.4.13rc02/scripts/makefile.solaris-x86
--- libpng-1.4.12/scripts/makefile.solaris-x86	2012-07-09 19:38:23.702132014 -0500
+++ libpng-1.4.13rc02/scripts/makefile.solaris-x86	2014-01-30 15:26:50.140157168 -0600
@@ -8,9 +8,9 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
-LIBNAME = libpng%N%
+LIBNAME = libpng%NN%
 PNGMAJ = %SONUM%
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -25,9 +25,9 @@
 LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f
 
-# Where make install puts libpng.a, libpng%N%.so*, and png.h
+# Where make install puts libpng.a, libpng%NN%.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)
 
 # Where the zlib library and include files are located
@@ -43,9 +43,9 @@
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%N% -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%NN% -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
@@ -87,18 +87,18 @@
 	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng%N%!-lpng%N%\ -lz\ -lm! > libpng.pc
+	-e s!-lpng%NN%!-lpng%NN%\ -lz\ -lm! > libpng.pc
 
 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo cppflags=\""; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng%N% -lz -lm\"; \
+	echo libs=\"-lpng%NN% -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)