diff --git a/openerp/cli/__init__.py b/openerp/cli/__init__.py
index d5d726e808d..a48d20e4483 100644
--- a/openerp/cli/__init__.py
+++ b/openerp/cli/__init__.py
@@ -10,8 +10,10 @@ commands = {}
 class CommandType(type):
     def __init__(cls, name, bases, attrs):
         super(CommandType, cls).__init__(name, bases, attrs)
-        name = cls.__name__.lower()
-        commands[name] = cls
+        name = getattr(cls, name, cls.__name__.lower())
+        cls.name = name
+        if name != 'command':
+            commands[name] = cls
 
 class Command(object):
     """Subclass this class to define new openerp subcommands """
@@ -20,6 +22,12 @@ class Command(object):
     def run(self, args):
         pass
 
+class Help(Command):
+    def run(self, args):
+        print "Available commands:\n"
+        for k, v in commands.items():
+            print "    %s" % k
+
 import server
 
 def main():