diff --git a/ChangeLog b/ChangeLog
index 300b6ba1..64761570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+jilles      2007/02/21 19:52:51 UTC	(20070221-3213)
+  Log:
+  Put "End of Channel Quiet List" instead of
+  "End of Channel Ban List" for a +q list.
+  Due to client restrictions the numerics for
+  quiet lists must be the same as for ban lists.
+  
+
+  Changes:	Modified:
+  +4 -1		trunk/src/chmode.c (File Modified) 
+
+
 jilles      2007/02/20 00:34:28 UTC	(20070220-3211)
   Log:
   Port over ratbox 2.2 r23507, r23624, r23626 (jilles/anfl):
diff --git a/extensions/no_oper_invis.c b/extensions/no_oper_invis.c
index 8449b8fc..6d7ec287 100644
--- a/extensions/no_oper_invis.c
+++ b/extensions/no_oper_invis.c
@@ -3,7 +3,7 @@
  * hidden_oper privilege).
  * -- jilles
  *
- * $Id: no_oper_invis.c 1086 2006-03-17 23:20:30Z jilles $
+ * $Id: no_oper_invis.c 3215 2007-02-24 18:35:58Z jilles $
  */
 
 #include "stdinc.h"
@@ -22,7 +22,7 @@ mapi_hfn_list_av1 noi_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(no_oper_invis, NULL, NULL, NULL, NULL, noi_hfnlist, "$Revision: 1086 $");
+DECLARE_MODULE_AV1(no_oper_invis, NULL, NULL, NULL, NULL, noi_hfnlist, "$Revision: 3215 $");
 
 static void
 h_noi_umode_changed(hook_data_umode_changed *hdata)
@@ -37,5 +37,7 @@ h_noi_umode_changed(hook_data_umode_changed *hdata)
 		 * if they opered up while invisible -- jilles */
 		if (hdata->oldumodes & UMODE_OPER)
 			sendto_one_notice(source_p, ":*** Opers may not set themselves invisible");
+		else /* XXX oper_up() should really do this */
+			Count.invisi--;
 	}
 }
diff --git a/include/serno.h b/include/serno.h
index 6354e4f2..0471cba1 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070220-3211"
+#define SERNO "20070221-3213"