diff --git a/ChangeLog.txt b/ChangeLog.txt
index a686d7075f..2c588fc6b2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-12-10 17:24 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/filesys.c
+    * added HB_OS2_NONAMEDPIPES macro for OS2 build tests
+  * src/rtl/hbproces.c
+    * formatting
+
 2015-12-09 23:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbssl/ssl_sock.c
     + recognize "ssl" item in hash array socket filter as alternative to
diff --git a/src/rtl/filesys.c b/src/rtl/filesys.c
index ccf395ab98..5a83227876 100644
--- a/src/rtl/filesys.c
+++ b/src/rtl/filesys.c
@@ -845,13 +845,16 @@ HB_FHANDLE hb_fsPOpen( const char * pszFileName, const char * pszMode )
 }
 
 #if defined( HB_OS_OS2 )
+#  if ! defined( HB_OS2_NONAMEDPIPES ) && ! defined( HB_OS2_USENAMEDPIPES )
 
 /* In OS2 anonymous pipes are not simulated by named pipes and
    unlike in MS-Windows functions for named pipes cannot be used
    with anonymous ones. Read/Write operations from/to anonymous
    pipes are always blocking on OS2. For unblocking access we
    have to emulate anonymous pipe using named one [druzus] */
-#  define HB_OS2_USENAMEDPIPES
+#     define HB_OS2_USENAMEDPIPES
+
+#  endif
 
 /* the size of sustem IO buffers in OS2 pipes */
 #  define HB_OS2_PIPEBUFSIZE        4096
diff --git a/src/rtl/hbproces.c b/src/rtl/hbproces.c
index 235c549fff..6ad5fc6ed4 100644
--- a/src/rtl/hbproces.c
+++ b/src/rtl/hbproces.c
@@ -591,13 +591,13 @@ HB_FHANDLE hb_fsProcessOpen( const char * pszFileName,
       }
       if( ret == NO_ERROR && phStdout != NULL )
       {
-         ret = DosQueryFHState( hPipeOut[ 0 ], &ulState);
+         ret = DosQueryFHState( hPipeOut[ 0 ], &ulState );
          if( ret == NO_ERROR && ( ulState & OPEN_FLAGS_NOINHERIT ) == 0 )
             ret = DosSetFHState( hPipeOut[ 0 ], ( ulState & 0xFF00 ) | OPEN_FLAGS_NOINHERIT );
       }
       if( ret == NO_ERROR && phStderr != NULL && phStdout != phStderr )
       {
-         ret = DosQueryFHState( hPipeErr[ 0 ], &ulState);
+         ret = DosQueryFHState( hPipeErr[ 0 ], &ulState );
          if( ret == NO_ERROR && ( ulState & OPEN_FLAGS_NOINHERIT ) == 0 )
             ret = DosSetFHState( hPipeErr[ 0 ], ( ulState & 0xFF00 ) | OPEN_FLAGS_NOINHERIT );
       }