diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1d6547f989..772341f51a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-20 00:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/pp/hbppgen.c
+    ! added hb_setGetDirSeparator()
+
+  * harbour/source/common/hbfsapi.c
+    ! fixed wrong index in path updating
+
 2008-02-19 23:37 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/main/harbour.c
   * harbour/source/common/hbfsapi.c
diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c
index 9911720a12..9727280123 100644
--- a/harbour/source/common/hbfsapi.c
+++ b/harbour/source/common/hbfsapi.c
@@ -254,11 +254,11 @@ HB_EXPORT char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName )
    {
       int iLen = strlen( pszFileName ) - 1;
 
-      if( iLen < _POSIX_PATH_MAX - 1 && pszFileName[ iLen ] != cDirSep &&
+      if( iLen < _POSIX_PATH_MAX - 2 && pszFileName[ iLen ] != cDirSep &&
           strchr( OS_PATH_DELIMITER_LIST, pszFileName[ iLen ] ) == NULL )
       {
-         pszFileName[ iLen ] = OS_PATH_DELIMITER;
-         pszFileName[ iLen + 1 ] = '\0';
+         pszFileName[ iLen + 1 ] = OS_PATH_DELIMITER;
+         pszFileName[ iLen + 2 ] = '\0';
       }
    }
 
diff --git a/harbour/source/pp/hbppgen.c b/harbour/source/pp/hbppgen.c
index 9682145f8c..48b2a124f6 100644
--- a/harbour/source/pp/hbppgen.c
+++ b/harbour/source/pp/hbppgen.c
@@ -66,6 +66,7 @@ void * hb_xgrab( ULONG ulSize ) { return malloc( ulSize ); }
 void * hb_xrealloc( void * pMem, ULONG ulSize ) { return realloc( pMem, ulSize ); }
 void hb_xfree( void * pMem ) { free( pMem ); }
 BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) { if( pfFree ) * pfFree = FALSE; return szFileName; }
+int hb_setGetDirSeparator( void ) { return OS_PATH_DELIMITER; }
 
 
 /*