diff --git a/ChangeLog b/ChangeLog
index f4c3441f0..c0522e7cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/03/25 17:59:50 UTC	(20070325-3281)
+  Log:
+  NEWS: As in 2.1.3, mention that the TS6 revision will
+  interoperate with older versions
+  
+
+  Changes:	Modified:
+  +2 -1		trunk/NEWS (File Modified) 
+
+
 jilles      2007/03/18 16:29:31 UTC	(20070318-3275)
   Log:
   Fix documentation of HIDE_SERVERS_IPS define.
diff --git a/include/serno.h b/include/serno.h
index 6bd1003ab..06231a429 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070318-3275"
+#define SERNO "20070325-3281"
diff --git a/modules/m_who.c b/modules/m_who.c
index b62d30116..2bec0964d 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_who.c 1853 2006-08-24 18:30:52Z jilles $
+ *  $Id: m_who.c 3283 2007-03-28 13:11:30Z jilles $
  */
 #include "stdinc.h"
 #include "tools.h"
@@ -51,7 +51,7 @@ struct Message who_msgtab = {
 };
 
 mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV1(who, NULL, NULL, who_clist, NULL, NULL, "$Revision: 1853 $");
+DECLARE_MODULE_AV1(who, NULL, NULL, who_clist, NULL, NULL, "$Revision: 3283 $");
 
 static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
 			      int server_oper, int member);
@@ -119,7 +119,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 	if(IsChannelName(mask))
 	{
 		/* List all users on a given channel */
-		chptr = find_channel(mask);
+		chptr = find_channel(parv[1]);
 		if(chptr != NULL)
 		{
 			if(operspy)
@@ -131,7 +131,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 				do_who_on_channel(source_p, chptr, server_oper, NO);
 		}
 		sendto_one(source_p, form_str(RPL_ENDOFWHO),
-			   me.name, source_p->name, mask);
+			   me.name, source_p->name, parv[1]);
 		return 0;
 	}