diff -ru4NwbB libpng-1.2.30/png.h libpng-1.2.31rc03/png.h
--- libpng-1.2.30/png.h	2008-08-15 09:14:43.090369603 -0500
+++ libpng-1.2.31rc03/png.h	2008-08-19 17:55:48.777471924 -0500
@@ -197,8 +197,10 @@
  *    1.0.38rc01-08           10    10038  10.so.0.38[.0]
  *    1.2.30rc01-08           13    10230  12.so.0.30[.0]
  *    1.0.38                  10    10038  10.so.0.38[.0]
  *    1.2.30                  13    10230  12.so.0.30[.0]
+ *    1.0.38rc01-03           10    10039  10.so.0.39[.0]
+ *    1.2.31rc01-03           13    10231  12.so.0.31[.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
diff -ru4NwbB libpng-1.2.30/pngrutil.c libpng-1.2.31rc03/pngrutil.c
--- libpng-1.2.30/pngrutil.c	2008-08-19 12:13:48.016455533 -0500
+++ libpng-1.2.31rc03/pngrutil.c	2008-08-19 17:55:48.868237363 -0500
@@ -1,8 +1,8 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.31 [August 19, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 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.)
@@ -902,10 +902,8 @@
    png_set_cHRM_fixed(png_ptr, info_ptr,
       int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
       int_y_green, int_x_blue, int_y_blue);
 #endif
-   if (png_crc_finish(png_ptr, 0))
-      return;
 }
 #endif
 
 #if defined(PNG_READ_sRGB_SUPPORTED)
diff -ru4NwbB libpng-1.2.30/pngwrite.c libpng-1.2.31rc03/pngwrite.c
--- libpng-1.2.30/pngwrite.c	2008-08-19 12:14:06.890967330 -0500
+++ libpng-1.2.31rc03/pngwrite.c	2008-08-19 17:55:48.908086967 -0500
@@ -1,8 +1,8 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.31 [August 19, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 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.)
@@ -395,12 +395,17 @@
    png_write_IEND(png_ptr);
    /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
     * and restored again in libpng-1.2.30, may cause some applications that
     * do not set png_ptr->output_flush_fn to crash.  If your application
-    * experiences this problem, please report the event to
-    * png-mng-implement at lists.sf.net .
+    * experiences a problem, please try building libpng with
+    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
+    * png-mng-implement at lists.sf.net .  This kludge will be removed
+    * from libpng-1.4.0.
     */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED) && \
+    defined(PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED)
    png_flush(png_ptr);
+#endif
 }
 
 #if defined(PNG_WRITE_tIME_SUPPORTED)
 #if !defined(_WIN32_WCE)