diff --git a/CHANGELOG b/CHANGELOG
index bcd0dce0..aebe14a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -103,6 +103,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2010-02-09: Simon Goldschmidt/Stephane Lesage
+  * sockets.c: Fixed bug #28853 (lwip_recvfrom() returns 0 on receive time-out
+    or any netconn_recv() error)
+
   2010-02-09: Simon Goldschmidt
   * ppp.c: task #10154 (PPP: Update snmp in/out counters for tx/rx packets)
 
diff --git a/src/api/sockets.c b/src/api/sockets.c
index 3301e6b3..0ccafb1e 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -544,7 +544,7 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags,
         LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): buf == NULL, error is \"%s\"!\n",
           s, lwip_strerr(err)));
         sock_set_errno(sock, err_to_errno(err));
-        return 0;
+        return -1;
       }
       LWIP_ASSERT("buf != NULL", buf != NULL);
       sock->lastdata = buf;