diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 97fe0ebc9..a4a2b22e3 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -324,8 +324,9 @@
   <section xml:id="os-server-password-v2.1">
       <title>Servers password (servers, os-server-password)</title>
       <para>
-         Gets the encrypted administrative password set through the metadata
-         service.
+         Gets the encrypted administrative password. Also, clears the
+         encrypted administrative password for a server, which removes it from
+         the metadata server.
       </para>
       <wadl:resources
          href="../wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
index 11d170541..2e518de8d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
@@ -22,6 +22,7 @@
                         <resource id="os-server-password"
                             path="os-server-password">
                             <method href="#getPassword"/>
+                            <method href="#clearPassword"/>
                         </resource>
                     </resource>
                 </resource>
@@ -31,12 +32,14 @@
     <method name="GET" id="getPassword">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Get server password">
-            <para role="shortdesc">Gets the administrative password
-                for a server.</para>
+            <para role="shortdesc">
+                Gets the administrative password for a server.
+            </para>
             <para>
-              Policy defaults enable only users with the administrative role
-              or the owner of the server to perform this operation. Cloud providers can change
-              these permissions through the <code>policy.json</code> file.
+                Policy defaults enable only users with the administrative role
+                or the owner of the server to perform this operation. Cloud
+                providers can change these permissions through the
+                <code>policy.json</code> file.
             </para>
         </wadl:doc>
         <response status="200">
@@ -50,4 +53,25 @@
             </representation>
         </response>
     </method>
+    <method name="DELETE" id="clearPassword">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Clear admin password">
+            <para role="shortdesc">
+                Clears the encrypted administrative password for a server,
+                which removes it from the metadata server.
+            </para>
+            <para>
+                This action does not actually change the instance server
+                password.
+            </para>
+            <para>
+                Policy defaults enable only users with the administrative role
+                or the owner of the server to perform this operation. Cloud
+                providers can change these permissions through the
+                <code>policy.json</code> file.
+            </para>
+        </wadl:doc>
+        <response status="204">
+        </response>
+    </method>
 </application>