Index: libpng-config.in
--- libpng-config.in.orig	2010-01-03 06:05:36 +0100
+++ libpng-config.in	2010-01-05 10:18:54 +0100
@@ -16,8 +16,8 @@
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
 includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
+libs="-lpng"
+all_libs="-lpng -lz @LIBS@"
 I_opts="-I${includedir}"
 L_opts="-L${libdir}"
 R_opts=""
Index: libpng.pc.in
--- libpng.pc.in.orig	2010-01-03 06:05:36 +0100
+++ libpng.pc.in	2010-01-05 10:18:04 +0100
@@ -6,6 +6,6 @@
 Name: libpng
 Description: Loads and saves PNG files
 Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-Libs.private: @LIBS@
+Libs: -L${libdir} -lpng
+Libs.private: -lz @LIBS@
 Cflags: -I${includedir}
Index: pngconf.h
--- pngconf.h.orig	2010-01-03 06:05:36 +0100
+++ pngconf.h	2010-01-05 10:18:04 +0100
@@ -360,9 +360,9 @@
 #      ifdef _SETJMP_H
        /* If you encounter a compiler error here, see the explanation
         * near the end of INSTALL.
-        */
            __pngconf.h__ in libpng already includes setjmp.h;
            __dont__ include it again.;
+        */
 #      endif
 #    endif /* __linux__ */
 #  endif /* PNG_SKIP_SETJMP_CHECK */
