diff --git a/ChangeLog b/ChangeLog
index 3a0e82d..ad419bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+jilles      2007/05/27 13:07:27 UTC	(20070527-3494)
+  Log:
+  - allow JOIN 0 from remotes
+  - allow JOIN 0 from locals, but only if it is exactly one
+    zero and is the first channel
+  
+
+  Changes:	Modified:
+  +65 -0	trunk/modules/core/m_join.c (File Modified) 
+
+
 nenolod     2007/05/27 06:33:26 UTC	(20070527-3488)
   Log:
   - add some IDEAS, including SASL based opering, internally reworking channel access (custom access 
diff --git a/NEWS b/NEWS
index 697614c..148f608 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ See LICENSE for licensing details (GPL v2).
 -- charybdis-2.2.0
 
 - The I/O code has been reworked, file descriptor metadata is stored in a
-  hashtable and there are no longer any compiletime defines.
+  hashtable and the maximum number of clients can now be set in ircd.conf.
 - Improve error checking and error messages for kline/dline/xline/resv files.
 - Allow kline ipv6:address, unkline some.host and unkline ipv6:address
   without *@.
@@ -40,11 +40,8 @@ See LICENSE for licensing details (GPL v2).
   which silently reject).
 - Remove invite_ops_only config option, forcing it to YES.
 - Allow /invite (but not invex) to override +r, +l, +j in addition to +i.
-- Remove the need to compile in the maximum number of clients, it can be
-  set in ircd.conf now.
-- Add several new extensions, including createoperonly, and sno_whois.
-- Use ERR_TARGETLEFTIRC in some places where appropriate, instead of vague
-  error messages.
+- Add several new extensions, such as createoperonly.
+- Merge whois notice extensions into one and move it from snomask +y to +W.
 
 -- charybdis-2.1.2
 
@@ -378,5 +375,5 @@ modules in case the developers need them.
 Other files recommended for reading: BUGS, README.FIRST, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: NEWS 3480 2007-05-27 05:30:41Z nenolod $
+$Id: NEWS 3496 2007-05-30 10:22:01Z jilles $
 
diff --git a/include/serno.h b/include/serno.h
index 455290b..a66b83d 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070527-3488"
+#define SERNO "20070527-3494"