diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 64c59f936..1d736b922 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -17,41 +17,13 @@
       This page lists the
       Compute API v2.1 operations in the following order:</para>
       <itemizedlist role="compact">
-      <listitem>
-         <para>
-            <link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#versions-v2.1">
-               Versions
-            </link>
-         </para>
-      </listitem>
-      <listitem>
-         <para>
-            <link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-multiple-create-v2.1">
-               Servers
-            </link>
-         </para>
-      </listitem>
-      <listitem>
-         <para>
-            <link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-flavors-v2.1">
-               Flavors
-            </link>
-         </para>
-      </listitem>
-      <listitem>
-         <para>
-            <link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#limits-v2.1">
-               Limits
-            </link>
-         </para>
-      </listitem>
-      <listitem>
-         <para>
-            <link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-agents-v2.1">
-               Extensions
-            </link> in alphabetical order by resource
-         </para>
-      </listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#versions-v2.1">Versions</link></para></listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-multiple-create-v2.1">Servers</link></para></listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-flavors-v2.1">Flavors</link></para></listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#keypairs-v2.1">Keypairs</link></para></listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#limits-v2.1">Limits</link></para></listitem>
+      <listitem><para><link xlink:href="http://developer.openstack.org/api-ref-compute-v2.1.html#os-agents-v2.1">Extensions</link> in alphabetical order by resource
+      </para></listitem>
    </itemizedlist>
    <note>
       <para>
@@ -370,6 +342,13 @@
          href="../wadls/compute-api/src/v2.1/wadl/os-flavor-rxtx-v2.1.wadl"
          xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
    </section>
+   <section xml:id="keypairs-v2.1">
+      <title>Keypairs (keypairs)</title>
+      <para>Generates, imports, and deletes SSH keys.</para>
+      <wadl:resources
+         href="../wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl"
+         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+   </section>
    <section xml:id="limits-v2.1">
       <title>Limits (limits)</title>
       <para>
@@ -508,15 +487,6 @@
          href="../wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl"
          xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
    </section>
-   <section xml:id="os-keypairs-v2.1">
-      <title>Keypairs (os-keypairs)</title>
-      <para>
-         Generates, imports, and deletes SSH keys.
-      </para>
-      <wadl:resources
-         href="../wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl"
-         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-   </section>
    <section xml:id="os-migrations-v2.1">
       <title>Migrations (os-migrations)</title>
       <para>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl
index abca52064..3cfe788a5 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/keypairs-v2.1.wadl
@@ -38,7 +38,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/keypairs/keypairs-list-resp.json"
+                        href="../api_samples/keypairs/v2.2/keypairs-list-resp.json"
                     />
                 </wadl:doc>
             </representation>
@@ -55,7 +55,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/keypairs/keypairs-get-resp.json"
+                        href="../api_samples/keypairs/v2.2/keypairs-get-resp.json"
                     />
                 </wadl:doc>
             </representation>
@@ -79,7 +79,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/keypairs/keypairs-import-post-req.json"
+                        href="../api_samples/keypairs/v2.2/keypairs-import-post-req.json"
                     />
                 </wadl:doc>
                 <param name="name" style="plain" required="true"
@@ -89,6 +89,12 @@
                         <para>The name to associate with the
                             keypair.</para></wadl:doc>
                 </param>
+                <param name="type" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>The keypair type.</para></wadl:doc>
+                </param>
                 <param name="public_key" style="plain"
                     type="xsd:string" required="false">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -104,7 +110,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/keypairs/keypairs-import-post-resp.json"
+                        href="../api_samples/keypairs/v2.2/keypairs-import-post-resp.json"
                     />
                 </wadl:doc>
             </representation>