diff --git a/ChangeLog b/ChangeLog
index 0f7716f92..3746b1712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+jilles      2007/05/14 22:21:16 UTC	(20070514-3446)
+  Log:
+  Apply ratbox flood fix.
+  
+
+  Changes:	Modified:
+  +1 -0		trunk/doc/example.conf (File Modified) 
+  +5 -0		trunk/doc/reference.conf (File Modified) 
+  +3 -0		trunk/include/client.h (File Modified) 
+  +4 -0		trunk/include/reject.h (File Modified) 
+  +1 -0		trunk/include/s_conf.h (File Modified) 
+  +2 -0		trunk/src/client.c (File Modified) 
+  +3 -0		trunk/src/listener.c (File Modified) 
+  +1 -0		trunk/src/newconf.c (File Modified) 
+  +8 -5		trunk/src/packet.c (File Modified) 
+  +59 -2	trunk/src/reject.c (File Modified) 
+  +1 -0		trunk/src/s_conf.c (File Modified) 
+  +2 -0		trunk/src/s_serv.c (File Modified) 
+  +1 -0		trunk/src/s_user.c (File Modified) 
+
+
 nenolod     2007/05/09 00:32:08 UTC	(20070509-3444)
   Log:
   - fix a bug here
diff --git a/include/serno.h b/include/serno.h
index b82f81182..1c7810aaf 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070509-3444"
+#define SERNO "20070514-3446"
diff --git a/src/reject.c b/src/reject.c
index 3dd34060f..1073321c2 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: reject.c 3446 2007-05-14 22:21:16Z jilles $
+ *  $Id: reject.c 3456 2007-05-18 19:14:18Z jilles $
  */
 
 #include "stdinc.h"
@@ -262,6 +262,5 @@ del_unknown_ip(struct Client *client_p)
 			patricia_remove(unknown_tree, pnode);
 		}
 	}
-	/* well..this shouldn't happen */
-	s_assert(0);
+	/* this can happen due to m_webirc.c's manipulations, for example */
 }