diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 88b8a34c31..0eb772daf8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-28 10:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/hbsocket.c
+    ! fixed timeout updating in non Linux builds
+
+  * harbour/mpkg_rpm.sh
+    ! test 'gd-devel' version number not 'gd'
+
 2009-07-28 10:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
   * config/globsh.cf
diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh
index b44ce0a3f1..feeecbfd2b 100755
--- a/harbour/mpkg_rpm.sh
+++ b/harbour/mpkg_rpm.sh
@@ -104,7 +104,7 @@ then
 fi
 if test_reqrpm "gd-devel"
 then
-    v=`rpm -q gd|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"`
+    v=`rpm -q gd-devel|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"`
     [ "$v" -ge 2 ] && INST_PARAM="${INST_PARAM} --with gd"
 fi
 if test_reqrpm "unixodbc-devel" || test_reqrpm "unixODBC-devel"
diff --git a/harbour/source/rtl/hbsocket.c b/harbour/source/rtl/hbsocket.c
index d40bb9e97e..b6095ecaa2 100644
--- a/harbour/source/rtl/hbsocket.c
+++ b/harbour/source/rtl/hbsocket.c
@@ -1189,6 +1189,7 @@ static int hb_socketSelectRD( HB_SOCKET_T sd, HB_LONG timeout )
          if( timecurr > timer )
          {
             timeout -= timecurr - timer;
+            timer = timecurr;
             if( timeout > 0 )
                continue;
          }
@@ -1236,6 +1237,7 @@ static int hb_socketSelectWR( HB_SOCKET_T sd, HB_LONG timeout )
          if( timecurr > timer )
          {
             timeout -= timecurr - timer;
+            timer = timecurr;
             if( timeout > 0 )
                continue;
          }
@@ -1297,6 +1299,7 @@ static int hb_socketSelectWRE( HB_SOCKET_T sd, HB_LONG timeout )
          if( timecurr > timer )
          {
             timeout -= timecurr - timer;
+            timer = timecurr;
             if( timeout > 0 )
                continue;
          }