diff --git a/ANNOUNCE b/ANNOUNCE
index e69e2d276e995d7583ee37ced9dba1ba848c9827..5c982db7707eb78ed221a1cb98afed4376bd4286 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0beta68 - July 7, 2009
+Libpng 1.4.0beta68 - July 18, 2009
 
 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.
@@ -499,7 +499,8 @@ version 1.4.0beta67 [July 6, 2009]
   Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.
   Added an "xcode" project to the projects directory (Alam Arias).
 
-version 1.4.0beta68 [July 7, 2009]
+version 1.4.0beta68 [July 18, 2009]
+  Avoid some tests in filter selection in pngwutil.c
 
 version 1.4.0betaN [future]
   Build shared libraries with -lz and sometimes -lm.
diff --git a/CHANGES b/CHANGES
index d08ef2002da48f349f51bb055aa27f5995737f52..d202d433af4064fd3ad3a608adc0644a7cc348d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2176,7 +2176,8 @@ version 1.4.0beta67 [July 6, 2009]
   Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.
   Added an "xcode" project to the projects directory (Alam Arias).
 
-version 1.4.0beta68 [July 7, 2009]
+version 1.4.0beta68 [July 18, 2009]
+  Avoid some tests in filter selection in pngwutil.c
 
 version 1.4.0betaN [future]
   Build shared libraries with -lz and sometimes -lm.
diff --git a/pngwutil.c b/pngwutil.c
index 599a3ee7ec944d181991b029d57ebeff0fec3db6..b71f5b9a7c163878269c7dbf93b92186e81a788a 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.4.0 [July 7, 2009]
+ * Last changed in libpng 1.4.0 [July 18, 2009]
  * Copyright (c) 1998-2009 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.)
@@ -2130,7 +2130,13 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
    png_uint_32 row_bytes = row_info->rowbytes;
 #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
    int num_p_filters = (int)png_ptr->num_prev_filters;
-#endif
+#else
+  if (png_ptr->row_number == 0)
+  {
+     /* These will never be selected so we need not test them. */
+     filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
+  }
+#endif 
 
    png_debug(1, "in png_write_find_filter");
    /* Find out how many bytes offset each pixel is */