diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 89bf7526d..7e0867911 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -45,12 +45,14 @@
   </section>
   <section xml:id="v2.1agents">
     <title>Guest agents (os-agents)</title>
-    <para>Creates, updates, and deletes guest agents. Use guest agents
-      to access files on the disk, configure networking, or run other
-      applications or scripts in the guest while it runs. This
-      hypervisor-specific extension is not currently enabled for KVM.
-      Use of guest agents is possible only if the underlying service
-      provider uses the Xen driver.</para>
+    <para>
+      Creates, lists, updates, and deletes guest agent builds. Use guest
+      agents to access files on the disk, configure networking, or run other
+      applications or scripts in the guest while the agent runs. This
+      hypervisor-specific extension is not currently enabled for KVM. Use of
+      guest agents is possible only if the underlying service provider uses
+      the Xen driver.
+    </para>
     <wadl:resources
       href="../wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.json
index 191349854..b8009e5ff 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.json
@@ -5,6 +5,6 @@
         "architecture": "x86",
         "version": "8.0",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "http://example.com/path/to/resource"
+        "url": "xxxxxxxxxxxx"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.xml
deleted file mode 100644
index b7b7d036b..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<agent>
-  <hypervisor>hypervisor</hypervisor>
-  <os>os</os>
-  <architecture>x86</architecture>
-  <version>8.0</version>
-  <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-  <url>http://example.com/path/to/resource</url>
-</agent>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.json
index 24ddede90..82aaeecc5 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.json
@@ -5,7 +5,7 @@
         "hypervisor": "hypervisor",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "os": "os",
-        "url": "http://example.com/path/to/resource",
+        "url": "xxxxxxxxxxxx",
         "version": "8.0"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.xml
deleted file mode 100644
index abfe15f90..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-post-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agent>
-  <url>http://example.com/path/to/resource</url>
-  <hypervisor>hypervisor</hypervisor>
-  <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-  <version>8.0</version>
-  <architecture>x86</architecture>
-  <os>os</os>
-  <agent_id>1</agent_id>
-</agent>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.json
index f7398504d..e166abf9e 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.json
@@ -1,6 +1,6 @@
 {
-    "para": {
-        "url": "http://example.com/path/to/resource",
+    "agent": {
+        "url": "xxx://xxxx/xxx/xxx",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "version": "7.0"
     }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.xml
deleted file mode 100644
index 9a25cefdd..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<para>
-  <version>7.0</version>
-  <url>http://example.com/path/to/resource</url>
-  <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</para>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.json
index 2919d2138..b399e4538 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.json
@@ -1,8 +1,8 @@
 {
     "agent": {
-        "agent_id": "1",
+        "agent_id": 1,
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "http://example.com/path/to/resource",
+        "url": "xxx://xxxx/xxx/xxx",
         "version": "7.0"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.xml
deleted file mode 100644
index ce62db386..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agent-update-put-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agent>
-  <url>http://example.com/path/to/resource</url>
-  <version>7.0</version>
-  <agent_id>1</agent_id>
-  <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</agent>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.json
index 92e14e1dc..bd1d70b42 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.json
@@ -6,7 +6,7 @@
             "hypervisor": "hypervisor",
             "md5hash": "add6bb58e139be103324d04d82d8f545",
             "os": "os",
-            "url": "http://example.com/path/to/resource",
+            "url": "xxxxxxxxxxxx",
             "version": "8.0"
         }
     ]
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.xml
deleted file mode 100644
index d80424530..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-agents/agents-get-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agents>
-    <agent url="http://example.com/path/to/resource" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
-</agents>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
index e46ce1e1f..b078b2aee 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE application [<!ENTITY % common  SYSTEM "../common.ent">
 %common;]>
-<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved -->
+<!-- (C) 2013-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:wadl="http://wadl.dev.java.net/2009/02"
@@ -9,13 +9,20 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-agents-v2.1">
-        <resource id="v2.1" path="//v2.1">
+        <resource id="version" type="#VersionDetails" path="//v2.1">
             <resource id="os-agents" path="os-agents">
                 <method href="#agentbuild"/>
                 <method href="#listbuilds"/>
-                <resource id="id" path="{id}">
+                <resource path="{id}" id="agent_id">
+                    <param name="id" style="template"
+                        required="true" type="xsd:int">
+                        <wadl:doc
+                            xmlns="http://docbook.org/ns/docbook"
+                            xml:lang="EN"><para>The agent ID.</para></wadl:doc>
+                    </param>
                     <method href="#updatebuild"/>
                 </resource>
+                <method href="#deleteBuild"/>
             </resource>
         </resource>
     </resources>
@@ -76,6 +83,26 @@
                         href="../api_samples/os-agents/agent-update-put-req.json"
                     />
                 </wadl:doc>
+                <param name="url" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The URL
+                           associated with the
+                        agent.</para></wadl:doc>
+                </param>
+                <param name="md5hash" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The MD5 hash.</para></wadl:doc>
+                </param>
+                <param name="version" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The version.</para></wadl:doc>
+                </param>
             </representation>
         </request>
         <response status="200">
@@ -86,7 +113,41 @@
                         href="../api_samples/os-agents/agent-update-put-resp.json"
                     />
                 </wadl:doc>
+                <param name="agent_id" style="plain"
+                    required="true" type="xsd:int">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The agent ID.</para></wadl:doc>
+                </param>
+                <param name="url" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The URL
+                           associated with the
+                        agent.</para></wadl:doc>
+                </param>
+                <param name="md5hash" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The MD5 hash.</para></wadl:doc>
+                </param>
+                <param name="version" style="plain"
+                    required="true" type="xsd:string">
+                    <wadl:doc
+                        xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>The version.</para></wadl:doc>
+                </param>
             </representation>
         </response>
     </method>
+    <method name="DELETE" id="deleteBuild">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Delete agent build">
+            <para role="shortdesc">Deletes an existing agent
+                build.</para>
+        </wadl:doc>
+        <response status="202"/>
+    </method>
 </application>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.json
index 191349854..b8009e5ff 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.json
@@ -5,6 +5,6 @@
         "architecture": "x86",
         "version": "8.0",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "http://example.com/path/to/resource"
+        "url": "xxxxxxxxxxxx"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.xml
index b7b7d036b..ee5fdce22 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-req.xml
@@ -5,5 +5,5 @@
   <architecture>x86</architecture>
   <version>8.0</version>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-  <url>http://example.com/path/to/resource</url>
+  <url>xxxxxxxxxxxx</url>
 </agent>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.json
index 24ddede90..ebaf63b75 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.json
@@ -1,11 +1,11 @@
 {
     "agent": {
-        "agent_id": 1,
+        "agent_id": "1",
         "architecture": "x86",
         "hypervisor": "hypervisor",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "os": "os",
-        "url": "http://example.com/path/to/resource",
+        "url": "xxxxxxxxxxxx",
         "version": "8.0"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.xml
index abfe15f90..b87086cc0 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-post-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agent>
-  <url>http://example.com/path/to/resource</url>
+  <url>xxxxxxxxxxxx</url>
   <hypervisor>hypervisor</hypervisor>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
   <version>8.0</version>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.json
index f7398504d..532a7ab67 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.json
@@ -1,6 +1,6 @@
 {
     "para": {
-        "url": "http://example.com/path/to/resource",
+        "url": "xxx://xxxx/xxx/xxx",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "version": "7.0"
     }
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.xml
index 9a25cefdd..60285ce37 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-req.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <para>
   <version>7.0</version>
-  <url>http://example.com/path/to/resource</url>
+  <url>xxx://xxxx/xxx/xxx</url>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
 </para>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.json
index 2919d2138..2acfb243f 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.json
@@ -2,7 +2,7 @@
     "agent": {
         "agent_id": "1",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "http://example.com/path/to/resource",
+        "url": "xxx://xxxx/xxx/xxx",
         "version": "7.0"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.xml
index ce62db386..cd9443d74 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agent-update-put-resp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agent>
-  <url>http://example.com/path/to/resource</url>
+  <url>xxx://xxxx/xxx/xxx</url>
   <version>7.0</version>
   <agent_id>1</agent_id>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.json
index 92e14e1dc..ed653a86d 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.json
@@ -1,12 +1,12 @@
 {
     "agents": [
         {
-            "agent_id": 1,
+            "agent_id": "1",
             "architecture": "x86",
             "hypervisor": "hypervisor",
             "md5hash": "add6bb58e139be103324d04d82d8f545",
             "os": "os",
-            "url": "http://example.com/path/to/resource",
+            "url": "xxxxxxxxxxxx",
             "version": "8.0"
         }
     ]
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.xml
index d80424530..7abfb71e8 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-agents/agents-get-resp.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agents>
-    <agent url="http://example.com/path/to/resource" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
+  <agent url="xxxxxxxxxxxx" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
 </agents>