diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 894d33af57..9b28858d5e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,11 +17,25 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-22 01:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * external/pcre/Makefile
+    ! Forcing C mode for this external component, which is
+      mainly tested and developed for C compiler.
+      Currently sunpro has problems in C++ mode due to little
+      bug in current PCRE code. Reported to author here:
+         http://bugs.exim.org/show_bug.cgi?id=939
+
+  * utils/hbmk2/hbmk2.prg
+    * Minor formatting.
+
+  * contrib/hbcairo/core.c
+    * Using HB_TRUE/HB_FALSE instead of 1/0.
+
 2009-12-22 02:22 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/hbcairo/core.c
     * used current GC API to store references between GC blocks
     ! fixed GC block storage
-    * added additional protection against using released path in 
+    * added additional protection against using released path in
       cairo_path_iterator_*()
 
   * harbour/contrib/hbcairo/text.c
diff --git a/harbour/contrib/hbcairo/core.c b/harbour/contrib/hbcairo/core.c
index 9b8a646962..fd0694785e 100644
--- a/harbour/contrib/hbcairo/core.c
+++ b/harbour/contrib/hbcairo/core.c
@@ -414,14 +414,14 @@ HB_FUNC( CAIRO_PATH_ITERATOR_SET_POINTS )
             }
             else
             {
-               hb_retl( 0 );
+               hb_retl( HB_FALSE );
                return;
             }
          }
-         hb_retl( 1 );
+         hb_retl( HB_TRUE );
       }
       else
-         hb_retl( 0 );
+         hb_retl( HB_FALSE );
    }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile
index 4ee4d46c2e..f6b0b77ddc 100644
--- a/harbour/external/pcre/Makefile
+++ b/harbour/external/pcre/Makefile
@@ -7,6 +7,7 @@ ROOT := ../../
 include $(TOP)$(ROOT)config/global.mk
 
 HB_BUILD_WARN := no
+HB_BUILD_MODE := c
 
 C_SOURCES := \
    chartabs.c \
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d080795074..ceee705bfa 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -330,6 +330,7 @@ REQUEST hbmk_KEYW
 
 #define hb_DirCreate( d )     MakeDir( d )
 #define hb_DirDelete( d )     DirRemove( d )
+#define hb_CurDrive()         CurDrive()
 
 PROCEDURE Main( ... )
    LOCAL aArgsIn := hb_AParams()
@@ -6339,8 +6340,6 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem )
 
    RETURN cItem
 
-#define hb_CurDrive() CurDrive()
-
 STATIC FUNCTION hb_pwd()
    RETURN DirAddPathSep( hb_CurDrive() + hb_osDriveSeparator() + hb_osPathSeparator() + CurDir() )