diff --git a/README.rst b/README.rst
index 6dbf9d012..4fa833bfe 100644
--- a/README.rst
+++ b/README.rst
@@ -153,7 +153,7 @@ You'll find complete documentation on the shell by running ``keystone help``::
                             subcommands.
 
     Optional arguments:
-    --version               show program's version number and exit
+    --version               Shows the client version and exits
     --timeout <seconds>     Set request timeout (in seconds)
     --os-username <auth-user-name>
                             Name used for authentication with the OpenStack
@@ -192,11 +192,11 @@ You'll find complete documentation on the shell by running ``keystone help``::
     --os-cert <certificate>
                             Defaults to env[OS_CERT]
     --os-key <key>          Defaults to env[OS_KEY]
-    --os-cache              Use the auth token cache. Default to env[OS_CACHE]
-    --force-new-token       If keyring is available and in used, token will always
-                            be stored and fetched from the keyring, until the
-                            token has expired. Use this option to request a new
-                            token and replace the existing one in keyring.
+    --os-cache              Use the auth token cache. Defaults to env[OS_CACHE]
+    --force-new-token       If the keyring is available and in use, token will
+                            always be stored and fetched from the keyring until
+                            the token has expired. Use this option to request a
+                            new token and replace the existing one in the keyring.
     --stale-duration <seconds>
                             Stale duration (in seconds) used to determine whether
                             a token has expired when retrieving it from keyring.
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index 7d526194e..b75f9f69f 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -84,7 +84,8 @@ class OpenStackIdentityShell(object):
 
         parser.add_argument('--version',
                             action='version',
-                            version=keystoneclient.__version__)
+                            version=keystoneclient.__version__,
+                            help="Shows the client version and exits")
 
         parser.add_argument('--debug',
                             default=False,
@@ -208,7 +209,7 @@ class OpenStackIdentityShell(object):
                             default=env('OS_CACHE', default=False),
                             action='store_true',
                             help='Use the auth token cache. '
-                                 'Default to env[OS_CACHE]')
+                                 'Defaults to env[OS_CACHE]')
         parser.add_argument('--os_cache',
                             help=argparse.SUPPRESS)
 
@@ -216,12 +217,12 @@ class OpenStackIdentityShell(object):
                             default=False,
                             action="store_true",
                             dest='force_new_token',
-                            help="If keyring is available and in used, "
+                            help="If the keyring is available and in use, "
                                  "token will always be stored and fetched "
-                                 "from the keyring, until the token has "
+                                 "from the keyring until the token has "
                                  "expired. Use this option to request a "
                                  "new token and replace the existing one "
-                                 "in keyring.")
+                                 "in the keyring.")
 
         parser.add_argument('--stale-duration',
                             metavar='<seconds>',