diff --git a/ChangeLog.txt b/ChangeLog.txt
index ea1103271d..fb8ae9b866 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-08-28 17:18 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/hbsocket.c
+    ! use sock_errno() instead of errno in OS2 WATCOM builds.
+      It fixes few problems with socket code using errno value, i.e.
+      hb_socketConnect() with timeout.
+
 2013-08-27 01:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * config/global.mk
     * disabled HB_BUILD_CONTRIB_DYN in default non MS-Windows builds
diff --git a/src/rtl/hbsocket.c b/src/rtl/hbsocket.c
index 8726945b0f..e57267a898 100644
--- a/src/rtl/hbsocket.c
+++ b/src/rtl/hbsocket.c
@@ -789,6 +789,10 @@ PHB_ITEM hb_socketGetIFaces( int af, HB_BOOL fNoAliases )
 #  define HB_SOCK_GETERROR()              WSAGetLastError()
 #  define HB_SOCK_IS_EINTR( err )         ( (err) == WSAEINTR )
 #  define HB_SOCK_IS_EINPROGRES( err )    ( (err) == WSAEWOULDBLOCK )
+#elif defined( HB_OS_OS2 ) && defined( __WATCOMC__ )
+#  define HB_SOCK_GETERROR()              sock_errno()
+#  define HB_SOCK_IS_EINTR( err )         ( (err) == EINTR )
+#  define HB_SOCK_IS_EINPROGRES( err )    ( (err) == EINPROGRESS )
 #else
 #  define HB_SOCK_GETERROR()              errno
 #  define HB_SOCK_IS_EINTR( err )         ( (err) == EINTR )