diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7c0de6d929..c3ea31bde9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,10 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-17 15:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/win_tprn.prg
+    ! Fixed to not refer to legacy function WIN_GETEXEFILENAME().
+      Probably this was causing the link-time symbol collision
+      problem once reported by Mindaugas.
+
+  * contrib/hbwin/hbwin.ch
+    + Added WIN_RGB() macro to replace RGB(). Latter is now
+      deprectaed.
+
+  * ChangeLog
+    + TOMERGE added to prev entry.
+
 2010-01-17 10:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbhpdf/harupdf.c
     ! HPDF_Page_TextWidth() fixed to return double instead of long.
       As suggested by Francesco Perillo.
+      [TOMERGE 2.0]
 
   * contrib/hbwin/hbwin.ch
   * contrib/hbwin/tests/testprn.prg
diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch
index ce1a18ed8d..5b2158774a 100644
--- a/harbour/contrib/hbwin/hbwin.ch
+++ b/harbour/contrib/hbwin/hbwin.ch
@@ -149,7 +149,10 @@
 
 #define PS_SOLID                    0
 
-#define RGB( nR, nG, nB )           ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
+#define WIN_RGB( nR, nG, nB )       ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
+
+/* deprecated */
+#define RGB( nR, nG, nB )           WIN_RGB( nR, nG, nB )
 
 #define RGB_BLACK                   RGB( 0x00, 0x00, 0x00 )
 #define RGB_BLUE                    RGB( 0x00, 0x00, 0x85 )
diff --git a/harbour/contrib/hbwin/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg
index e95618511b..435c14ec0d 100644
--- a/harbour/contrib/hbwin/win_tprn.prg
+++ b/harbour/contrib/hbwin/win_tprn.prg
@@ -285,7 +285,7 @@ METHOD PROCEDURE Destruct() CLASS WIN_PRN
 METHOD StartDoc( cDocName ) CLASS WIN_PRN
    LOCAL lResult
 
-   DEFAULT cDocName TO win_GetExeFileName() + " [" + DToC( Date() ) + " - " + Time() + "]"
+   DEFAULT cDocName TO hb_ArgV( 0 ) + " [" + DToC( Date() ) + " - " + Time() + "]"
 
    IF ( lResult := win_StartDoc( ::hPrinterDc, cDocName ) )
       IF !( lResult := ::StartPage( ::hPrinterDc ) )