diff --git a/src/command/command.c b/src/command/command.c
index 00ab1b2c..fff81351 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -277,13 +277,20 @@ static struct cmd_t main_commands[] =
 
     { "/roster",
         _cmd_roster, parse_args_with_freetext, 0, 3,
-        { "/roster nick jid [handle]", "Add or change a contacts handle.",
-        { "/roster nick jid [handle]",
-          "-------------------------",
-          "Change the nickname (handle) associated with a contact in your roster."
-          "If no handle is supplied, any existing handle will be removed.",
+        { "/roster [add|remove|nick] [jid] [handle]", "Manage your roster.",
+        { "/roster [add|remove|nick] [jid] [handle]",
+          "----------------------------------------",
+          "View, add to, and remove from your roster.",
+          "Passing no arguments lists all contacts in your roster.",
+          "The 'add' command will add a new item, the jid is required, the handle is an optional nickname",
+          "The 'remove' command removes a contact, the jid is required.",
+          "The 'nick' command changes a contacts nickname, the jid is required,",
+          "if no handle is supplied, the current one is removed.",
           "",
-          "Example : /roster nick bob.smith@server.com bobby",
+          "Example : /roster (show your roster)",
+          "Example : /roster add someone@contacts.org (add the contact)",
+          "Example : /roster add someone@contacts.org Buddy (add the contact with nickname 'Buddy')",
+          "Example : /roster remove someone@contacts.org (remove the contact)",
           "Example : /roster nick myfriend@chat.org My Friend",
           "Example : /roster nick kai@server.com (clears handle)",
           NULL } } },