diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 37485a0c29..430b79c8da 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-12 12:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbnetio/netiosrv.c
+    ! fixed typo in NETIO_SRVSTATUS() - -2 was always returned
+      (modification committed by mistake in my previous commit)
+    ! fixed to return .F. by NETIO_SRVSEND{DATA,IETM}() if hb_znetFlush()
+      reports error.
+      Many thanks for Aleksander Czajczyński for information about problems
+      and his extensive tests.
+
 2010-05-12 09:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.pt_BR.po
   * utils/hbmk2/hbmk2.hu_HU.po
diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c
index 9919a401ae..5dd19ae600 100644
--- a/harbour/contrib/hbnetio/netiosrv.c
+++ b/harbour/contrib/hbnetio/netiosrv.c
@@ -398,7 +398,10 @@ static long s_srvSendAll( PHB_CONSRV conn, void * buffer, long len )
          }
       }
       if( conn->zstream && lLast > 0 && !conn->stop )
-         hb_znetFlush( conn->zstream, conn->sd, -1 );
+      {
+         if( hb_znetFlush( conn->zstream, conn->sd, -1 ) != 0 )
+            lSent = -1;
+      }
 
       if( conn->mutex )
          hb_threadMutexUnlock( conn->mutex );