diff --git a/ANNOUNCE b/ANNOUNCE
index 6e4d99b9c..4d1164f36 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -27,8 +27,10 @@ Changes since the last public release (1.6.13):
 
 Version 1.6.14beta01 [September 11, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
-  Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
-    complete without setjmp support (bug report by Claudio Fontana)
+  Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED,
+    to allow "make" to complete without setjmp support (bug report by
+    Claudio Fontana)
+  Add "#include <setjmp.h>" to contrib/tools/pngfix.c (John Bowler)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 5e3aad574..b8210d417 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4980,8 +4980,10 @@ Version 1.6.13 [August 21, 2014]
 
 Version 1.6.14beta01 [September 11, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
-  Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
-    complete without setjmp support (bug report by Claudio Fontana)
+  Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED,
+    to allow "make" to complete without setjmp support (bug report by
+    Claudio Fontana)
+  Add "#include <setjmp.h>" to contrib/tools/pngfix.c (John Bowler)
 
 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 b194adbfe..4db0b14b5 100644
--- a/contrib/tools/pngfix.c
+++ b/contrib/tools/pngfix.c
@@ -18,7 +18,6 @@
 #include <limits.h>
 #include <errno.h>
 #include <assert.h>
-#include <setjmp.h>
 
 #define implies(x,y) assert(!(x) || (y))
 
@@ -50,6 +49,9 @@
 #  error "pngfix will not work with libpng prior to 1.6.3"
 #endif
 
+#ifdef PNG_SETJMP_SUPPORTED
+#include <setjmp.h>
+
 #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
@@ -4035,3 +4037,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 */
+