diff --git a/CHANGELOG b/CHANGELOG
index 58b8a885..3eadb446 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -95,6 +95,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-05-05 Simon Goldschmidt
+  * sockets.c: bug #26405: Prematurely released semaphore causes lwip_select()
+    to crash
+
   2009-05-04 Simon Goldschmidt
   * init.c: snmp was not initialized in lwip_init()
 
diff --git a/src/api/sockets.c b/src/api/sockets.c
index 44faa1b7..1711ea18 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -1101,8 +1101,8 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
     }
     if (scb) {
       scb->sem_signalled = 1;
-      sys_sem_signal(selectsem);
       sys_sem_signal(scb->sem);
+      sys_sem_signal(selectsem);
     } else {
       sys_sem_signal(selectsem);
       break;