diff --git a/CHANGELOG b/CHANGELOG
index 4b17d173..f56a12e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2010-01-23: Simon Goldschmidt
+  * sockets.c: Fixed bug #28716: select() returns 0 after waiting for less
+    than 1 ms
+
   2010-01-21: Simon Goldschmidt
   * tcp.c, api_msg.c: Fixed bug #28651 (tcp_connect: no callbacks called
     if tcp_enqueue fails) both in raw- and netconn-API
diff --git a/src/api/sockets.c b/src/api/sockets.c
index 31ef133c..32c3752b 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -991,7 +991,7 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
     sys_sem_signal(selectsem);
     
     sys_sem_free(select_cb.sem);
-    if (i == 0)  {
+    if (i == SYS_ARCH_TIMEOUT)  {
       /* Timeout */
       if (readset)
         FD_ZERO(readset);