diff --git a/xC.c b/xC.c
index 5a59a8f..c464aaa 100644
--- a/xC.c
+++ b/xC.c
@@ -12937,6 +12937,16 @@ handle_command_kill (struct handler_args *a)
 	return true;
 }
 
+static bool
+handle_command_away (struct handler_args *a)
+{
+	if (*a->arguments)
+		irc_send (a->s, "AWAY :%s", a->arguments);
+	else
+		irc_send (a->s, "AWAY");
+	return true;
+}
+
 static bool
 handle_command_nick (struct handler_args *a)
 {
@@ -13002,7 +13012,6 @@ TRIVIAL_HANDLER (who,   "WHO")
 TRIVIAL_HANDLER (motd,  "MOTD")
 TRIVIAL_HANDLER (oper,  "OPER")
 TRIVIAL_HANDLER (stats, "STATS")
-TRIVIAL_HANDLER (away,  "AWAY")
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -