diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1d1f166a7f..030765467c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-10 12:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/3rd/png/Makefile
+    - Do not set PNG_NO_SETJMP anymore.
+    % Minor opt in condition check for PNG_NO_SNPRINTF.
+
 2011-01-10 11:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbhpdf/3rd/libhpdf/hpdfimap.c
   * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
diff --git a/harbour/src/3rd/png/Makefile b/harbour/src/3rd/png/Makefile
index d8230fe5a0..2a404fdf0e 100644
--- a/harbour/src/3rd/png/Makefile
+++ b/harbour/src/3rd/png/Makefile
@@ -47,15 +47,9 @@ ifeq ($(filter $(HB_COMPILER),poccarm xcc),)
          HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
          HB_CFLAGS_DYN := -DPNG_BUILD_DLL
 
-         ifeq ($(HB_COMPILER),djgpp)
+         ifneq ($(filter $(HB_COMPILER),djgpp dmc),)
             HB_CFLAGS += -DPNG_NO_SNPRINTF
          endif
-         ifeq ($(HB_COMPILER),dmc)
-            HB_CFLAGS += -DPNG_NO_SNPRINTF
-         endif
-         ifeq ($(HB_COMPILER),watcom)
-            HB_CFLAGS += -DPNG_NO_SETJMP
-         endif
 
          include $(TOP)$(ROOT)config/lib.mk
       else