diff --git a/ChangeLog b/ChangeLog
index cfe931c30..57d546247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+jilles      2007/03/28 15:40:24 UTC	(20070328-3307)
+  Log:
+  Merge old trunk r2081:
+  Don't say that services cannot be killed in
+  ERR_ISCHANSERVICE message (given when trying
+  to kick or deop them), as that's not the case.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/src/messages.tab (File Modified) 
+
+
 jilles      2007/03/28 15:30:56 UTC	(20070328-3305)
   Log:
   Merge old trunk r2059
diff --git a/include/serno.h b/include/serno.h
index 5e6fddaa5..b5155a835 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3305"
+#define SERNO "20070328-3307"
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index d475aaf1d..e2189de68 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kick.c 258 2005-09-21 23:57:17Z nenolod $
+ *  $Id: m_kick.c 3317 2007-03-28 23:17:06Z jilles $
  */
 
 #include "stdinc.h"
@@ -49,7 +49,7 @@ struct Message kick_msgtab = {
 
 mapi_clist_av1 kick_clist[] = { &kick_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 258 $");
+DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 3317 $");
 
 /*
 ** m_kick
@@ -74,10 +74,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	comment = LOCAL_COPY((EmptyString(parv[3])) ? parv[2] : parv[3]);
-	if(strlen(comment) > (size_t) REASONLEN)
-		comment[REASONLEN] = '\0';
-
 	*buf = '\0';
 	if((p = strchr(parv[1], ',')))
 		*p = '\0';
@@ -163,6 +159,10 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			return 0;
 		}
 
+		comment = LOCAL_COPY((EmptyString(parv[3])) ? who->name : parv[3]);
+		if(strlen(comment) > (size_t) REASONLEN)
+			comment[REASONLEN] = '\0';
+
 		/* jdc
 		 * - In the case of a server kicking a user (i.e. CLEARCHAN),
 		 *   the kick should show up as coming from the server which did