--- ircd-hybrid/trunk/src/s_bsd_kqueue.c	2013/12/29 13:00:42	2724
+++ ircd-hybrid/trunk/src/s_bsd_kqueue.c	2013/12/29 13:01:00	2725
@@ -120,7 +120,11 @@
                (F->write_handler ? COMM_SELECT_WRITE : 0);
 
   if (timeout != 0)
+  {
     F->timeout = CurrentTime + (timeout / 1000);
+    F->timeout_handler = handler;
+    F->timeout_data = client_data;
+  }
 
   diff = new_events ^ F->evcache;