diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5e674e4380..4eaddfaa3e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-02 20:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * external/libpng/Makefile
+    * Forcing C mode for libpng.
+      It has some C++ bugs (in WINCE mode).
+      Please retest.
+
 2009-12-02 08:04 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.prg
     ! Fixed more artifacts.
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index 3a746f437b..0f8fe160e7 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -9,6 +9,7 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := libpng
 
 HB_BUILD_WARN := no
+HB_BUILD_MODE := c
 
 C_SOURCES := \
    png.c \