diff --git a/ChangeLog b/ChangeLog
index 34f5153..6bf87fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+nenolod     2007/04/03 10:18:07 UTC	(20070403-3372)
+  Log:
+  - rename m_list_safelist to m_list and remove ratbox implementation
+  
+
+  Changes:	Modified:
+  +393 -664	trunk/modules/Makefile.in (File Modified) 
+  + -		trunk/modules/m_list.c (File Added) 
+  + -		trunk/modules/m_list_ratbox.c (File Deleted) 
+  + -		trunk/modules/m_list_safelist.c (File Deleted) 
+
+
 nenolod     2007/04/03 10:15:39 UTC	(20070403-3370)
   Log:
   - some more transit to sendto_one_numeric().
diff --git a/include/serno.h b/include/serno.h
index 51cde46..f333b41 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070403-3370"
+#define SERNO "20070403-3372"
diff --git a/libcharybdis/epoll.c b/libcharybdis/epoll.c
index 45335f8..30565a2 100644
--- a/libcharybdis/epoll.c
+++ b/libcharybdis/epoll.c
@@ -23,7 +23,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: epoll.c 3229 2007-03-05 17:23:07Z nenolod $
+ *  $Id: epoll.c 3374 2007-04-03 10:49:11Z nenolod $
  */
 
 #include "config.h"
@@ -112,9 +112,7 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
 	if(timeout)
 		F->timeout = CurrentTime + (timeout / 1000);
 
-	if(old_flags == 0 && F->pflags == 0)
-		return;
-	else if(F->pflags <= 0)
+	if(!(F->pflags & EPOLLIN) && !(F->pflags & EPOLLOUT))
 		op = EPOLL_CTL_DEL;
 	else if(old_flags == 0 && F->pflags > 0)
 		op = EPOLL_CTL_ADD;
@@ -133,8 +131,6 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
 		libcharybdis_log("comm_setselect(): epoll_ctl failed: %s", strerror(errno));
 		abort();
 	}
-
-
 }
 
 /*