diff --git a/ChangeLog.txt b/ChangeLog.txt
index bae1b50632..c7710e5db7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-09-16 15:11 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/hbsocket.c
+    ! added missing error setting in hb_socketSelect() function
+
 2013-09-16 15:00 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   + doc/pp_prg.txt
     + added description for preprocessor PRG API - __PP_*() functions
diff --git a/src/rtl/hbsocket.c b/src/rtl/hbsocket.c
index 0f90362dfa..c0b3940948 100644
--- a/src/rtl/hbsocket.c
+++ b/src/rtl/hbsocket.c
@@ -2806,6 +2806,7 @@ int hb_socketSelect( PHB_ITEM pArrayRD, HB_BOOL fSetRD,
       ptv = NULL;
 
    ret = select( ( int ) ( maxsd + 1 ), pfds[ 0 ], pfds[ 1 ], pfds[ 2 ], ptv );
+   hb_socketSetOsError( ret == -1 ? HB_SOCK_GETERROR() : 0 );
 
    for( i = 0; i < 3; i++ )
    {