diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b157e2d565..4137ec1c77 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,25 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-11 16:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu.bat
+    + Minor adjustment to support OS/2 cross-builds.
+
+  * source/rtl/gtwvt/gtwvt.c
+    * Minor adjustment to casting to Windows type.
+
+  * contrib/hbfimage/Makefile
+    - Disabled for OS/2.
+
+  * bin/postinst.cmd
+    + Synced with .bat. 'copy' replaced by 'xcopy'.
+
+  * config/os2/watcom.cf
+    + Added fix (from win/watcom.cf) to swap dirseps
+      for wcc386 as it cannot accept forward slashes.
+      Przemek, please adapt this for Linux, as it's
+      probably not needed there.
+
 2009-07-11 15:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/os2/watcom.cf
   * harbour/config/os2/dir.cf
diff --git a/harbour/bin/postinst.cmd b/harbour/bin/postinst.cmd
index 4647003b59..90581aa23a 100644
--- a/harbour/bin/postinst.cmd
+++ b/harbour/bin/postinst.cmd
@@ -13,13 +13,21 @@ rem
 rem See COPYING for licensing terms.
 rem ---------------------------------------------------------------
 
-set _HBMK_CFG=%HB_BIN_INSTALL%\hbmk.cfg
-echo Generating %_HBMK_CFG%...
-echo # Harbour Make configuration> %_HBMK_CFG%
-echo # Generated by Harbour build process>> %_HBMK_CFG%
-echo arch=%HB_ARCHITECTURE%>> %_HBMK_CFG%
-echo comp=%HB_COMPILER%>> %_HBMK_CFG%
-set _HBMK_CFG=
+echo Generating %HB_BIN_INSTALL%\hbmk.cfg...
+echo # Harbour Make configuration> %HB_BIN_INSTALL%\hbmk.cfg
+echo # Generated by Harbour build process>> %HB_BIN_INSTALL%\hbmk.cfg
+echo.>> %HB_BIN_INSTALL%\hbmk.cfg
+echo libpaths=../contrib/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
+echo libpaths=../contrib/rddsql/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
+echo libpaths=../addins/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
+echo libpaths=../examples/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
+
+rem ; Post-build installation
+if not "%HB_INSTALL_PREFIX%" == "" xcopy /y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" xcopy /y COPYING    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" xcopy /y ERRATA     "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" xcopy /y INSTALL    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" xcopy /y TODO       "%HB_INSTALL_PREFIX%\" > nul
 
 goto INST_%HB_ARCHITECTURE%
 
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index 973122aa86..6196dac312 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -60,6 +60,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CPPFLAGS += -d2
 endif
 
+ifeq ($(CC),wcc386)
+CC_RULE = $(CC) $(subst /,\,$(CPPFLAGS)) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(subst /,\,$(CC_IN)) $(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+endif
+
 # Note: The empty line directly before 'endef' HAVE TO exist!
 # It causes that the 'echo' command is separated by LF
 define link_file
diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile
index ac15d30835..e57f39323c 100644
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -10,6 +10,7 @@ HB_INC_FREEIMAGE_OK =
 
 ifneq ($(HB_ARCHITECTURE),dos)
 # disabled until a proper solution is found for type collision
+ifneq ($(HB_ARCHITECTURE),os2)
 ifneq ($(HB_ARCHITECTURE),linux)
 ifneq ($(HB_ARCHITECTURE),darwin)
 
@@ -51,3 +52,6 @@ endif
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index cdfc59f036..5822c68c46 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -160,6 +160,8 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    set _HB_CHECK=
    set _HB_PATH=
 
+   if "%HB_ARCHITECTURE%" == "os2" goto SKIP_WINDLL
+
    rem ---------------------------------------------------------------
    rem Start the GNU Make system
 
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index b87b036e3d..d579481215 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -1516,7 +1516,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
  * hb_gt_wvt_TextOut converts col and row to x and y ( pixels ) and calls
  * the Windows function TextOut with the expected coordinates
  */
-static BOOL hb_gt_wvt_TextOut( PHB_GTWVT pWVT, HDC hdc, int col, int row, int iColor, LPCTSTR lpString, USHORT cbString )
+static BOOL hb_gt_wvt_TextOut( PHB_GTWVT pWVT, HDC hdc, int col, int row, int iColor, LPCTSTR lpString, UINT cbString )
 {
    POINT xy;
    RECT  rClip;
@@ -1575,7 +1575,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
          }
          else if( iColor != iOldColor )
          {
-            hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( USHORT ) len );
+            hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( UINT ) len );
             iOldColor = iColor;
             startCol = iCol;
             len = 0;
@@ -1594,7 +1594,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
          }
          else if( iColor != iOldColor || hFont != hOldFont )
          {
-            hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( USHORT ) len );
+            hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( UINT ) len );
             if( hFont != hOldFont )
             {
                SelectObject( hdc, hFont );
@@ -1609,7 +1609,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
          iCol++;
       }
       if( len > 0 )
-         hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( USHORT ) len );
+         hb_gt_wvt_TextOut( pWVT, hdc, startCol, iRow, iOldColor, text, ( UINT ) len );
    }
 
    EndPaint( pWVT->hWnd, &ps );