diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 1f6fedc17..deec8ef79 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -31,6 +31,13 @@
       </wadl:resource>
     </wadl:resources>
   </section>
+  <section xml:id="v2.1os-availability-zone">
+        <title>Availability zones (os-availability-zone)</title>
+        <para>Gets availability zone information.</para>
+        <wadl:resources
+            href="../wadls/compute-api/src/v2.1/wadl/os-availability-zone-v2.1.wadl"
+            xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+    </section>
   <section xml:id="v2.1server-actions">
         <title>Server actions (servers)</title>
         <para>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-detail-resp.json
new file mode 100644
index 000000000..ed87dcca7
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-detail-resp.json
@@ -0,0 +1,54 @@
+{
+    "availabilityZoneInfo": [
+        {
+            "zoneState": {
+                "available": true
+            },
+            "hosts": {
+                "test-host": {
+                    "nova-conductor": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:55.000000"
+                    },
+                    "nova-cert": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:55.000000"
+                    },
+                    "nova-consoleauth": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:55.000000"
+                    },
+                    "nova-scheduler": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:55.000000"
+                    },
+                    "nova-network": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:54.000000"
+                    }
+                }
+            },
+            "zoneName": "internal"
+        },
+        {
+            "zoneState": {
+                "available": true
+            },
+            "hosts": {
+                "test-host": {
+                    "nova-compute": {
+                        "available": true,
+                        "active": true,
+                        "updated_at": "2015-04-16T08:58:56.000000"
+                    }
+                }
+            },
+            "zoneName": "nova"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-resp.json
new file mode 100644
index 000000000..2d4ad7802
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-resp.json
@@ -0,0 +1,11 @@
+{
+    "availabilityZoneInfo": [
+        {
+            "zoneState": {
+                "available": true
+            },
+            "hosts": null,
+            "zoneName": "nova"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-availability-zone-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-availability-zone-v2.1.wadl
new file mode 100644
index 000000000..f510c4afb
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-availability-zone-v2.1.wadl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2012-2015 OpenStack Foundation, All Rights Reserved -->
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
+    <resources base="https://servers.api.openstack.com"
+        xml:id="os-availability-zone-v2.1">
+        <resource id="version" type="#VersionDetails" path="//v2.1">
+            <resource path="os-availability-zone" id="os-availability-zone">
+                    <method href="#getAvailabilityZone"/>
+                <resource path="detail" id="detial">
+                    <method href="#getAvailabilityZoneDetails"/>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    <method name="GET" id="getAvailabilityZone">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Get availability zone information">
+            <para role="shortdesc">Gets availability zone information.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get availability zone information: JSON response">
+                    <xsdxt:code
+                        href="../api_samples/os-availability-zone/availability-zone-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="getAvailabilityZoneDetails">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Get detailed availability zone information">
+            <para role="shortdesc">Gets detailed availability zone information.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get detailed availability zone information: JSON response">
+                    <xsdxt:code
+                        href="../api_samples/os-availability-zone/availability-zone-detail-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+</application>
+