diff --git a/ChangeLog b/ChangeLog
index f00ff33d..701830e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+nenolod     2007/04/03 10:11:06 UTC	(20070403-3368)
+  Log:
+  - change some sendto_one() to sendto_one_numeric().
+  
+
+  Changes:	Modified:
+  +4 -10	trunk/modules/m_admin.c (File Modified) 
+  +3 -3		trunk/modules/m_map.c (File Modified) 
+  +12 -12	trunk/src/messages.tab (File Modified) 
+  +1 -2		trunk/src/s_conf.c (File Modified) 
+  +9 -10	trunk/src/s_user.c (File Modified) 
+
+
 nenolod     2007/04/03 09:57:53 UTC	(20070403-3366)
   Log:
   - river's ports.c from old charybdis trunk
diff --git a/include/serno.h b/include/serno.h
index 0c682601..85e01efb 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070403-3366"
+#define SERNO "20070403-3368"
diff --git a/modules/m_away.c b/modules/m_away.c
index 39db10a7..e6ff385c 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_away.c 254 2005-09-21 23:35:12Z nenolod $
+ *  $Id: m_away.c 3370 2007-04-03 10:15:39Z nenolod $
  */
 
 #include "stdinc.h"
@@ -46,7 +46,7 @@ struct Message away_msgtab = {
 };
 
 mapi_clist_av1 away_clist[] = { &away_msgtab, NULL };
-DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $");
 
 /***********************************************************************
  * m_away() - Added 14 Dec 1988 by jto. 
@@ -95,8 +95,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			source_p->user->away = NULL;
 		}
 		if(MyConnect(source_p))
-			sendto_one(source_p, form_str(RPL_UNAWAY),
-				   me.name, source_p->name);
+			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
 		return 0;
 	}
 
@@ -135,7 +134,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	source_p->user->away = away;
 
 	if(MyConnect(source_p))
-		sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);
+		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
 
 	return 0;
 }
diff --git a/src/messages.tab b/src/messages.tab
index 033d5df1..4bf8b3b2 100644
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -16,7 +16,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: messages.tab 3368 2007-04-03 10:11:06Z nenolod $
+ *   $Id: messages.tab 3370 2007-04-03 10:15:39Z nenolod $
  */
 
 static  const char *  replies[] = {
@@ -241,7 +241,7 @@ static  const char *  replies[] = {
 /* 218 RPL_STATSYLINE, */       "Y %s %d %d %d %u %d.%d %d.%d %u",
 /* 219 RPL_ENDOFSTATS, */       "%c :End of /STATS report",
 /* 220 RPL_STATSPLINE, */       "%c %d %s %d :%s",
-/* 221 RPL_UMODEIS, */          ":%s 221 %s %s",
+/* 221 RPL_UMODEIS, */          "%s",
 /* 222 */	NULL,
 /* 223 */       NULL,
 /* 224 */       NULL,
@@ -327,8 +327,8 @@ static  const char *  replies[] = {
 /* 302 RPL_USERHOST, */  ":%s 302 %s :%s",
 /* 303 RPL_ISON, */     ":%s 303 %s :",
 /* 304 RPL_TEXT, */      NULL,
-/* 305 RPL_UNAWAY, */   ":%s 305 %s :You are no longer marked as being away",
-/* 306 RPL_NOWAWAY, */  ":%s 306 %s :You have been marked as being away",
+/* 305 RPL_UNAWAY, */   ":You are no longer marked as being away",
+/* 306 RPL_NOWAWAY, */  ":You have been marked as being away",
 /* 307 */       NULL,
 /* 308 */       NULL,
 /* 309 */       NULL,
diff --git a/src/s_user.c b/src/s_user.c
index 35807179..62e7868b 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 3368 2007-04-03 10:11:06Z nenolod $
+ *  $Id: s_user.c 3370 2007-04-03 10:15:39Z nenolod $
  */
 
 #include "stdinc.h"
@@ -941,7 +941,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 				*m++ = (char) i;
 
 		*m = '\0';
-		sendto_one(source_p, form_str(RPL_UMODEIS), me.name, source_p->name, buf);
+		sendto_one_numeric(source_p, RPL_UMODEIS, form_str(RPL_UMODEIS), buf);
 
 		if (source_p->snomask != 0)
 			sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),