diff --git a/.cvsignore b/.cvsignore
index c19e2d3..32ff627 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpng-1.2.29.tar.bz2
+libpng-1.2.31.tar.bz2
diff --git a/libpng-multilib.patch b/libpng-multilib.patch
index fba135e..8b10eb9 100644
--- a/libpng-multilib.patch
+++ b/libpng-multilib.patch
@@ -1,6 +1,9 @@
-diff -Naur libpng-1.2.16.orig/scripts/libpng-config.in libpng-1.2.16/scripts/libpng-config.in
---- libpng-1.2.16.orig/scripts/libpng-config.in	2007-01-04 14:00:25.000000000 -0500
-+++ libpng-1.2.16/scripts/libpng-config.in	2007-02-12 10:25:43.000000000 -0500
+Use pkg-config to report libpng version and installation directories.
+
+
+diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
+--- libpng-1.2.31.orig/scripts/libpng-config.in	2008-05-29 13:37:58.000000000 -0400
++++ libpng-1.2.31/scripts/libpng-config.in	2008-08-23 16:57:20.000000000 -0400
 @@ -8,11 +8,11 @@
  
  # Modeled after libxml-config.
@@ -16,5 +19,5 @@ diff -Naur libpng-1.2.16.orig/scripts/libpng-config.in libpng-1.2.16/scripts/lib
 +libdir=`pkg-config --variable libdir libpng`
 +includedir=`pkg-config --variable includedir libpng`
  libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
- all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ -lz -lm"
+ all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
  I_opts="-I${includedir}"
diff --git a/libpng.spec b/libpng.spec
index 6620a51..b8dda60 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.29
+Version: 1.2.31
 Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Aug 23 2008 Tom Lane <tgl@redhat.com> 2:1.2.31-1
+- Update to libpng 1.2.31
+
 * Sat May 31 2008 Tom Lane <tgl@redhat.com> 2:1.2.29-1
 - Update to libpng 1.2.29 (fixes low-priority security issue CVE-2008-1382)
 Related: #441839
diff --git a/sources b/sources
index efd13e9..d7515e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f588cb4ee39e3a333604096f937ea157  libpng-1.2.29.tar.bz2
+78d2f8c4e0d64f8948819563587302d3  libpng-1.2.31.tar.bz2