diff --git a/lib/command.php b/lib/command.php
index 247ea44758..0c98c94ac4 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -643,6 +643,25 @@ class SubscribersCommand extends Command
     }
 }
 
+class GroupsCommand extends Command
+{
+    function execute($channel)
+    {
+        $group = $this->user->getGroups();
+        $groups=array();
+        while ($group->fetch()) {
+            $groups[]=$group->nickname;
+        }
+        if(count($groups)==0){
+            $out=_('You are not a member of any groups.');
+        }else{
+            $out=_('You are a member of these groups: ');
+            $out.=implode(', ',$groups);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -653,6 +672,7 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
+                           "groups - lists the groups you have joined\n".
                            "subscriptions - list the people you follow\n".
                            "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index c39fafb62b..665015afcc 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -59,6 +59,12 @@ class CommandInterpreter
             } else {
                 return new SubscriptionsCommand($user);
             }
+         case 'groups':
+            if ($arg) {
+                return null;
+            } else {
+                return new GroupsCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);