diff --git a/ANNOUNCE b/ANNOUNCE
index 95d5794ac..7522850a7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.14beta01 - August 21, 2014
+Libpng 1.6.14beta01 - September 10, 2014
 
 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.
@@ -25,8 +25,11 @@ Other information:
 
 Changes since the last public release (1.6.13):
 
-Version 1.6.14beta01 [August 21, 2014]
+Version 1.6.14beta01 [September 10, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
+  Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c
+    to allow "make all" to complete without setjmp support (bug report
+    by Claudio Fontana)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 478db1052..442aadc76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4978,8 +4978,11 @@ Version 1.6.13rc01 [August 14, 2014]
 Version 1.6.13 [August 21, 2014]
   No changes.
 
-Version 1.6.14beta01 [August 21, 2014]
+Version 1.6.14beta01 [September 10, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
+  Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c
+    to allow "make all" to complete without setjmp support (bug report
+    by Claudio Fontana)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c
index 068daf103..e12863ad8 100644
--- a/contrib/tools/pngfix.c
+++ b/contrib/tools/pngfix.c
@@ -49,6 +49,7 @@
 #  error "pngfix will not work with libpng prior to 1.6.3"
 #endif
 
+#ifdef PNG_SETJMP_SUPPORTED
 #if defined(PNG_READ_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED)
 /* zlib.h defines the structure z_stream, an instance of which is included
  * in this structure and is required for decompressing the LZ compressed
@@ -4034,3 +4035,12 @@ main(void)
    return 77;
 }
 #endif /* PNG_READ_SUPPORTED && PNG_EASY_ACCESS_SUPPORTED */
+#else /* No setjmp support */
+int
+main(void)
+{
+   fprintf(stderr, "pngfix does not work without setjmp support\n");
+   return 77;
+}
+#endif /* PNG_SETJMP_SUPPORTED */
+