diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8858606a3d..cf01a11e33 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-08-02 13:17 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/fserr.c
+    ! moved HB_TRACE() message - it was overwritting OS error code.
+
+  * harbour/src/rtl/filesys.c
+    ! removed dup2() function call left by mistake during some modifications
+
 2011-08-02 00:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/common/hbprintf.c
     + added very basic support for '%ls' in hb_snprintf()
diff --git a/harbour/src/rtl/filesys.c b/harbour/src/rtl/filesys.c
index b207312c51..b2ccea3f6a 100644
--- a/harbour/src/rtl/filesys.c
+++ b/harbour/src/rtl/filesys.c
@@ -716,7 +716,6 @@ HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode )
                   HB_FAILURE_RETRY( iResult, dup2( hPipeHandle[ 0 ], 0 ) );
                   HB_FAILURE_RETRY( iResult, dup2( hNullHandle, 1 ) );
                   HB_FAILURE_RETRY( iResult, dup2( hNullHandle, 2 ) );
-                  dup2( hNullHandle, 2 );
                }
                iMaxFD = sysconf( _SC_OPEN_MAX );
                if( iMaxFD < 3 )
diff --git a/harbour/src/rtl/fserr.c b/harbour/src/rtl/fserr.c
index 4685fd8e1d..07e176d6b6 100644
--- a/harbour/src/rtl/fserr.c
+++ b/harbour/src/rtl/fserr.c
@@ -195,8 +195,6 @@ void  hb_fsSetIOError( HB_BOOL fResult, HB_USHORT uiOperation )
    HB_ERRCODE uiOsErrorLast, uiErrorLast;
    PHB_IOERRORS pIOErrors;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_fsSetIOError(%d,%hu)", fResult, uiOperation));
-
    /* TODO: implement it */
    HB_SYMBOL_UNUSED( uiOperation );
 
@@ -214,6 +212,12 @@ void  hb_fsSetIOError( HB_BOOL fResult, HB_USHORT uiOperation )
       uiErrorLast = hb_errnoToDosError( iErrCode );
 #endif
    }
+
+   /* HB_TRACE() message is intentionally here to not overwrite
+    * OS error code processed above.
+    */
+   HB_TRACE(HB_TR_DEBUG, ("hb_fsSetIOError(%d,%hu)", fResult, uiOperation));
+
    pIOErrors = hb_stackIOErrors();
    pIOErrors->uiOsErrorLast = uiOsErrorLast;
    pIOErrors->uiErrorLast = uiErrorLast;