diff --git a/CHANGELOG b/CHANGELOG
index 0708a535..3671ca71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-11-20: Simon Goldschmidt (patch by Albert Bartel)
+  * sockets.c: Fixed bug #28062: Data received directly after accepting
+    does not wake up select
+
   2009-11-11: Simon Goldschmidt
   * netdb.h: Fixed bug #27994: incorrect define for freeaddrinfo(addrinfo)
 
diff --git a/src/api/sockets.c b/src/api/sockets.c
index f177261e..34ef098b 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -1059,6 +1059,7 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
         sys_sem_signal(socksem);
         return;
       }
+      s = conn->socket;
       sys_sem_signal(socksem);
     }