diff --git a/tools/cli/cloudmonkey/common.py b/tools/cli/cloudmonkey/common.py
index 3199af26c85..0865a8ee8cc 100644
--- a/tools/cli/cloudmonkey/common.py
+++ b/tools/cli/cloudmonkey/common.py
@@ -40,9 +40,9 @@ config_fields = {'host': 'localhost', 'port': '8080',
                  os.path.expanduser('~/.cloudmonkey_history')}
 
 # Add verbs in grammar
-grammar = ['create', 'list', 'delete', 'update',
+grammar = ['create', 'list', 'delete', 'update', 'lock',
            'enable', 'activate', 'disable', 'add', 'remove',
-           'attach', 'detach', 'associate', 'generate', 'ldap',
+           'attach', 'detach', 'associate', 'disassociate', 'generate', 'ldap',
            'assign', 'authorize', 'change', 'register', 'configure',
            'start', 'restart', 'reboot', 'stop', 'reconnect',
            'cancel', 'destroy', 'revoke', 'mark', 'reset',