diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index eae47cba87..b230102578 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-05 11:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/postinst.hb
+  * utils/hbmk2/hbmk2.prg
+    + Use the second parameter in HB_CWD() calls.
+
+  * contrib/hbformat/hbfmtcls.prg
+    ! fixed embedded comment in last commit.
+
 2012-10-05 10:28 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/src/rtl/philes.c
     * modified HB_CWD() to return previous path if new one is set by
diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb
index 6001b07567..8c119bf05a 100644
--- a/harbour/config/postinst.hb
+++ b/harbour/config/postinst.hb
@@ -215,8 +215,7 @@ PROCEDURE Main( ... )
                      no zip 2.x compatible way to force creation of a new .zip, so we have to delete it
                      first to avoid mixing in an existing .zip file. [vszakats] */
 
-            cOldDir := hb_cwd()
-            hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) )
+            cOldDir := hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) )
 
             mk_hb_processRun( PathSepToSelf( GetEnvC( "HB_DIR_ZIP" ) ) + "zip" +;
                               " -q -9 -X -r -o" +;
@@ -265,8 +264,7 @@ PROCEDURE Main( ... )
                cGroup := iif( GetEnvC( "HB_PLATFORM" ) == "darwin" .OR. ;
                               GetEnvC( "HB_PLATFORM" ) == "bsd", "wheel", "root" )
 
-               cOldDir := hb_cwd()
-               hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) )
+               cOldDir := hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) )
 
                /* TODO: Add support for non-GNU non-BSD tar (which gets the data from stdio) */
 
diff --git a/harbour/contrib/hbformat/hbfmtcls.prg b/harbour/contrib/hbformat/hbfmtcls.prg
index 1f91dc5e4d..51249a3c9d 100644
--- a/harbour/contrib/hbformat/hbfmtcls.prg
+++ b/harbour/contrib/hbformat/hbfmtcls.prg
@@ -61,12 +61,11 @@
 
 #define LEFTEQUAL( l, r )       ( Left( l, Len( r ) ) == r )
 
-/* TOFIX:
-     1. 'var ++'
-     2. '- 1' for numeric literals.
-     3. wrongly breaks line: 'FUNCTION Hello( /* comment */ )'
-     ...
- */
+// TOFIX:
+//   1. 'var ++'
+//   2. '- 1' for numeric literals.
+//   3. wrongly breaks line: 'FUNCTION Hello( /* comment */ )'
+//   ...
 
 CREATE CLASS HBFORMATCODE
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b03fe9a00b..8ad27df375 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6311,11 +6311,10 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                         IF hbmk[ _HBMK_lDONTEXEC ]
                            cCHD_DirOld := NIL
                         ELSE
-                           cCHD_DirOld := hb_cwd()
+                           cCHD_DirOld := hb_cwd( hbmk[ _HBMK_cWorkDir ] )
                            IF hbmk[ _HBMK_lTRACE ] .AND. hbmk[ _HBMK_lInfo ]
                               _hbmk_OutStd( hbmk, hb_StrFormat( I_( "'cd' to: %1$s" ), hbmk[ _HBMK_cWorkDir ] ) )
                            ENDIF
-                           hb_cwd( hbmk[ _HBMK_cWorkDir ] )
                         ENDIF
                      ENDIF