diff --git a/doc/source/command-objects/availability_zone.rst b/doc/source/command-objects/availability_zone.rst
new file mode 100644
index 0000000000..3743523088
--- /dev/null
+++ b/doc/source/command-objects/availability_zone.rst
@@ -0,0 +1,20 @@
+=================
+availability zone
+=================
+
+Compute v2
+
+availability zone list
+----------------------
+
+List availability zones and their status
+
+.. program availability zone list
+.. code:: bash
+
+    os availability zone list
+        [--long]
+
+.. option:: --long
+
+    List additional fields in output
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 04c451c8fb..50c72f6330 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -70,6 +70,7 @@ the API resources will be merged, as in the ``quota`` object that has options
 referring to both Compute and Volume quotas.
 
 * ``access token``: Identity - long-lived OAuth-based token
+* ``availability zone``: (**Compute**) a logical partition of hosts or volume services
 * ``aggregate``: (**Compute**) a grouping of servers
 * ``backup``: Volume - a volume copy
 * ``catalog``: (**Identity**) service catalog
diff --git a/openstackclient/compute/v2/availability_zone.py b/openstackclient/compute/v2/availability_zone.py
index c7c9241491..648c0ee4ce 100644
--- a/openstackclient/compute/v2/availability_zone.py
+++ b/openstackclient/compute/v2/availability_zone.py
@@ -59,7 +59,7 @@ def _xform_availability_zone(az, include_extra):
 
 
 class ListAvailabilityZone(lister.Lister):
-    """List Availability Zones and their status"""
+    """List availability zones and their status"""
 
     log = logging.getLogger(__name__ + '.ListAvailabilityZone')