diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8dee35fbd9..4a8eb973d9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-17 14:51 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbpgsql/tests/dbf2pg.prg
+    ! avoid OEM/ANSI conversion.Will now convert from
+      current CP to UTF8.
+    + CP can be set using '-cp <CP>' cmdline option.
+
+  * contrib/hbwin/hbwin.hbx
+    ! updated
+
 2012-09-17 14:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/contrib/hbwin/olecore.c
     ! fixed problems reported by Jose F. Gimenez
diff --git a/harbour/contrib/hbpgsql/tests/dbf2pg.prg b/harbour/contrib/hbpgsql/tests/dbf2pg.prg
index 0b75519552..ae7ae6f4e0 100644
--- a/harbour/contrib/hbpgsql/tests/dbf2pg.prg
+++ b/harbour/contrib/hbpgsql/tests/dbf2pg.prg
@@ -54,6 +54,8 @@
 #include "inkey.ch"
 #include "fileio.ch"
 
+#include "hbextcdp.ch"
+
 PROCEDURE Main( ... )
 
    LOCAL cTok
@@ -130,6 +132,9 @@ PROCEDURE Main( ... )
       CASE cTok == "-e"
          cPath := hb_PValue( i++ )
 
+      CASE cTok == "-cp"
+         hb_cdpSelect( hb_PValue( i++ ) )
+
       OTHERWISE
          help()
          QUIT
@@ -250,7 +255,7 @@ PROCEDURE Main( ... )
 
             IF cValue != NIL
                IF oRecord:Fieldtype( i ) == "C" .OR. oRecord:Fieldtype( i ) == "M"
-                  oRecord:FieldPut( i, hb_oemtoansi( cValue ) )
+                  oRecord:FieldPut( i, hb_StrToUTF8( cValue ) )
                ELSE
                   oRecord:FieldPut( i, cValue )
                ENDIF
@@ -264,7 +269,7 @@ PROCEDURE Main( ... )
          ?
          ? "Error Record: ", RecNo(), Left( oTable:ErrorMsg(), 70 )
          ?
-         FWrite( nHandle, "Error at record: " + Str( RecNo() ) + " Description: " + oTable:ErrorMsg() + hb_eol() )
+         FWrite( nHandle, "Error at record: " + hb_ntos( RecNo() ) + " Description: " + oTable:ErrorMsg() + hb_eol() )
       ELSE
          nCount++
       ENDIF
diff --git a/harbour/contrib/hbwin/hbwin.hbx b/harbour/contrib/hbwin/hbwin.hbx
index 82a226f630..f64f465201 100644
--- a/harbour/contrib/hbwin/hbwin.hbx
+++ b/harbour/contrib/hbwin/hbwin.hbx
@@ -429,9 +429,9 @@ DYNAMIC __OLEINVOKEGET
 DYNAMIC __OLEINVOKEMETHOD
 DYNAMIC __OLEINVOKEPUT
 DYNAMIC __OLEISDISP
-DYNAMIC __OLEVARIANT
-DYNAMIC __OLEVARIANTTYPE
-DYNAMIC __OLEVARIANTVALUE
+DYNAMIC __OLEVARIANTGETTYPE
+DYNAMIC __OLEVARIANTGETVALUE
+DYNAMIC __OLEVARIANTNEW
 DYNAMIC __WAPI_DEVMODE_GET
 DYNAMIC __WAPI_DEVMODE_NEW
 DYNAMIC __WAPI_DEVMODE_SET