diff --git a/ChangeLog b/ChangeLog
index 7612cc05..bae00fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+jilles      2007/07/14 13:34:50 UTC	(20070714-3534)
+  Log:
+  Use mask_match() to check bans from local clients for
+  redundancy. This fixes the problem that bans like *!?@*
+  prevent any ban starting with *!*@ being set.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/src/chmode.c (File Modified) 
+
+
 jilles      2007/07/14 13:32:18 UTC	(20070714-3532)
   Log:
   Add mask_match(), like ircu mmatch().
diff --git a/include/serno.h b/include/serno.h
index 6bab781a..b6eeae68 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070714-3532"
+#define SERNO "20070714-3534"
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 9d9490af..0b6dd326 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 3299 2007-03-28 14:54:10Z jilles $
+ *  $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
  */
 
 #include "stdinc.h"
@@ -67,7 +67,7 @@ mapi_hlist_av1 whois_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3299 $");
+DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
 
 /*
  * m_whois
@@ -96,7 +96,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 				sendto_one(source_p, form_str(RPL_LOAD2HI),
 					   me.name, source_p->name, "WHOIS");
 				sendto_one_numeric(source_p, RPL_ENDOFWHOIS, 
-						   form_str(RPL_ENDOFWHOIS), parv[1]);
+						   form_str(RPL_ENDOFWHOIS), parv[2]);
 				return 0;
 			}
 			else