diff --git a/doc/source/man/heat-api-cfn.rst b/doc/source/man/heat-api-cfn.rst
index ef5f74d78..9d3b51de5 100644
--- a/doc/source/man/heat-api-cfn.rst
+++ b/doc/source/man/heat-api-cfn.rst
@@ -33,6 +33,11 @@ OPTIONS
   over-ridden. The set is parsed after the file(s), if any, specified via 
   --config-file, hence over-ridden options in the directory take precedence.
 
+.. cmdoption:: --version
+
+  Show program's version number and exit. The output could be empty if
+  the distribution didn't specify any version information.
+
 FILES
 ========
 
diff --git a/doc/source/man/heat-api-cloudwatch.rst b/doc/source/man/heat-api-cloudwatch.rst
index 0f782dbb2..ed2f68914 100644
--- a/doc/source/man/heat-api-cloudwatch.rst
+++ b/doc/source/man/heat-api-cloudwatch.rst
@@ -27,6 +27,11 @@ OPTIONS
   over-ridden. The set is parsed after the file(s), if any, specified via 
   --config-file, hence over-ridden options in the directory take precedence.
 
+.. cmdoption:: --version
+
+  Show program's version number and exit. The output could be empty if
+  the distribution didn't specify any version information.
+
 FILES
 ========
 
diff --git a/doc/source/man/heat-api.rst b/doc/source/man/heat-api.rst
index c470e751d..b03892cfc 100644
--- a/doc/source/man/heat-api.rst
+++ b/doc/source/man/heat-api.rst
@@ -33,6 +33,11 @@ OPTIONS
   over-ridden. The set is parsed after the file(s), if any, specified via 
   --config-file, hence over-ridden options in the directory take precedence.
 
+.. cmdoption:: --version
+
+  Show program's version number and exit. The output could be empty if
+  the distribution didn't specify any version information.
+
 FILES
 ========
 
diff --git a/doc/source/man/heat-engine.rst b/doc/source/man/heat-engine.rst
index 86c2d2ccd..6c91f90e4 100644
--- a/doc/source/man/heat-engine.rst
+++ b/doc/source/man/heat-engine.rst
@@ -32,6 +32,11 @@ OPTIONS
   over-ridden. The set is parsed after the file(s), if any, specified via 
   --config-file, hence over-ridden options in the directory take precedence.
 
+.. cmdoption:: --version
+
+  Show program's version number and exit. The output could be empty if
+  the distribution didn't specify any version information.
+
 FILES
 ========
 
diff --git a/doc/source/man/heat-keystone-setup-domain.rst b/doc/source/man/heat-keystone-setup-domain.rst
index 878e3ee6c..e686f7e7d 100644
--- a/doc/source/man/heat-keystone-setup-domain.rst
+++ b/doc/source/man/heat-keystone-setup-domain.rst
@@ -86,7 +86,7 @@ OPTIONS
 
 .. cmdoption:: --version
 
-  Show program's version number and exit.  The output could be empty if
+  Show program's version number and exit. The output could be empty if
   the distribution didn't specify any version information.
 
 
diff --git a/doc/source/man/heat-manage.rst b/doc/source/man/heat-manage.rst
index 115b73ebe..9b306b4a7 100644
--- a/doc/source/man/heat-manage.rst
+++ b/doc/source/man/heat-manage.rst
@@ -44,6 +44,11 @@ Heat Db version
 
     Shows details for all currently running heat engines.
 
+``heat-manage --version``
+
+  Shows program's version number and exit. The output could be empty if
+  the distribution didn't specify any version information.
+
 FILES
 =====