diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d55aae7a01..e7f8f19ff5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-24 12:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/filesys.c
+    ! fixed typo and casting due to wrong OS2 API documentation
+    * use DosQueryCurrentDir() instead of DosQCurDir() macro
+
+    TOFIX: Current HVM cannot be compiled by OS2 Watcom
+
 2010-02-24 12:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/hb-func.sh
     * updated new contrib libraries
diff --git a/harbour/src/rtl/filesys.c b/harbour/src/rtl/filesys.c
index 3e31441749..71baa97e80 100644
--- a/harbour/src/rtl/filesys.c
+++ b/harbour/src/rtl/filesys.c
@@ -239,7 +239,7 @@
    #define HB_FS_GETDRIVE(n)  do { \
                                     ULONG ulDrive, ulLogical; \
                                     DosQueryCurrentDisk( &ulDrive, &ulLogical ); \
-                                    ( n ) == ( int ) ulDrive - 1; \
+                                    ( n ) = ( int ) ulDrive - 1; \
                               } while( 0 )
    #define HB_FS_SETDRIVE(n)  do { DosSetDefaultDisk( ( n ) + 1 ); } while( 0 )
 
@@ -2781,11 +2781,11 @@ HB_ERRCODE hb_fsCurDirBuff( int iDrive, char * pszBuffer, HB_SIZE ulSize )
 
    if( iDrive >= 0 )
    {
-      USHORT uiLen = ( USHORT ) ulSize;
+      ULONG ulLen = ( ULONG ) ulSize;
 
       hb_vmUnlock();
-      hb_fsSetIOError( DosQCurDir( ( USHORT ) iDrive, ( PBYTE ) pszBuffer,
-                                   &uiLen ) == NO_ERROR, 0 );
+      hb_fsSetIOError( DosQueryCurrentDir( iDrive, ( PBYTE ) pszBuffer,
+                                           &ulLen ) == NO_ERROR, 0 );
       hb_vmLock();
    }
    else