diff --git a/ChangeLog b/ChangeLog
index a5151ef73..53cfaac17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-25 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Source/NSBitmapImageRep+PNG.m
+	Skip libpng's check for setjmp. I hope we are indeed correct.
+
 2010-05-24 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTextView.m (-_characterIndexForPoint:respectFraction:):
diff --git a/Source/NSBitmapImageRep+PNG.m b/Source/NSBitmapImageRep+PNG.m
index f922a7353..f5906fee3 100644
--- a/Source/NSBitmapImageRep+PNG.m
+++ b/Source/NSBitmapImageRep+PNG.m
@@ -37,7 +37,7 @@
 #import "NSBitmapImageRep+PNG.h"
 
 #if HAVE_LIBPNG
-
+#define PNG_SKIP_SETJMP_CHECK 1
 #ifdef HAVE_LIBPNG_PNG_H
 #include <libpng/png.h>
 #else