diff --git a/README.rst b/README.rst
index 6207d89f0..1dbcc0049 100644
--- a/README.rst
+++ b/README.rst
@@ -198,7 +198,8 @@ You'll find complete documentation on the shell by running
         x509-create-cert    Create x509 cert for a user in tenant
         x509-get-root-cert  Fetches the x509 root cert.
         bash-completion     Prints all of the commands and options to stdout so
-                            that the
+                            that the nova.bash_completion script doesn't have to
+                            hard code them.
         help                Display help about this program or one of its
                             subcommands.
 
diff --git a/novaclient/shell.py b/novaclient/shell.py
index 198c42fc5..7f3257155 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -469,7 +469,7 @@ class OpenStackComputeShell(object):
             command = attr[3:].replace('_', '-')
             callback = getattr(actions_module, attr)
             desc = callback.__doc__ or ''
-            action_help = desc.strip().split('\n')[0]
+            action_help = desc.strip()
             arguments = getattr(callback, 'arguments', [])
 
             subparser = subparsers.add_parser(command,