diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5d99b8ddf7..db9374c77b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-28 10:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/hbtrace.c
+    ! Fixed some leftover causing error on non-win.
+    % Replaces \r\n with \n in printf() calls.
+      [TOMERGE 2.0]
+
+  * config/win/bcc.mk
+    + Added -CP437 bcc option as default, so that it fixes compilation
+      on windows systems are setup to use certain (f.e. far east)
+      multibytes codepages as default non-Unicode CP.
+
 2009-12-28 02:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbtrace.c
     ! Readded hack to disable reentrancy for win specific trace logic
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index c425d8607e..bba9517dd2 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -16,7 +16,7 @@ CC_OUT := -o
 
 CFLAGS += -I. -I$(HB_INC_COMPILE)
 
-CFLAGS += -q -tWM
+CFLAGS += -q -tWM -CP437
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w -w-sig- -Q
diff --git a/harbour/src/common/hbtrace.c b/harbour/src/common/hbtrace.c
index 533fb5de0c..039a554072 100644
--- a/harbour/src/common/hbtrace.c
+++ b/harbour/src/common/hbtrace.c
@@ -211,7 +211,6 @@ static void hb_tracelog_( int level, const char * file, int line, const char * p
     */
    vfprintf( s_fp, fmt, ap );
 
-   if( s_winout )
    /* TOFIX: va_end() is _required_ here according to all available documentation. */
    /* va_end( ap ); Generates access violation in the subsequent hb_vsnprintf */
 
@@ -239,10 +238,10 @@ static void hb_tracelog_( int level, const char * file, int line, const char * p
 
       /* We add \r\n at the end of the buffer to make WinDbg display look readable. */
       if( proc )
-         hb_snprintf( buffer2, sizeof( buffer2 ), "%s:%d:%s() %s %s\r\n",
+         hb_snprintf( buffer2, sizeof( buffer2 ), "%s:%d:%s() %s %s\n",
                       file, line, proc, pszLevel, buffer1 );
       else
-         hb_snprintf( buffer2, sizeof( buffer2 ), "%s:%d: %s %s\r\n",
+         hb_snprintf( buffer2, sizeof( buffer2 ), "%s:%d: %s %s\n",
                       file, line, pszLevel, buffer1 );
 
       #if defined( UNICODE )