diff --git a/doc/v3/api_samples/os-admin-password/admin-password-change-password.json b/doc/v3/api_samples/os-admin-password/admin-password-change-password.json
new file mode 100644
index 000000000..6fbfbea80
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/admin-password-change-password.json
@@ -0,0 +1,5 @@
+{
+    "change_password" : {
+        "admin_password" : "foo"
+    }
+}
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-admin-password/admin-password-change-password.xml b/doc/v3/api_samples/os-admin-password/admin-password-change-password.xml
new file mode 100644
index 000000000..1d9b55c7c
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/admin-password-change-password.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<change_password
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    admin_password="foo"/>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-admin-password/server-post-req.json b/doc/v3/api_samples/os-admin-password/server-post-req.json
new file mode 100644
index 000000000..d41985a1b
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "image_ref" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavor_ref" : "http://openstack.example.com/openstack/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-admin-password/server-post-req.xml b/doc/v3/api_samples/os-admin-password/server-post-req.xml
new file mode 100644
index 000000000..598839cf6
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" image_ref="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavor_ref="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-admin-password/server-post-resp.json b/doc/v3/api_samples/os-admin-password/server-post-resp.json
new file mode 100644
index 000000000..6928c1461
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "admin_pass": "oCYTjD2KnRtB",
+        "id": "aa3130b9-dffc-417b-aa03-93d5394a2fa6",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v3/servers/aa3130b9-dffc-417b-aa03-93d5394a2fa6",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/servers/aa3130b9-dffc-417b-aa03-93d5394a2fa6",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-admin-password/server-post-resp.xml b/doc/v3/api_samples/os-admin-password/server-post-resp.xml
new file mode 100644
index 000000000..2de8b90b1
--- /dev/null
+++ b/doc/v3/api_samples/os-admin-password/server-post-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="f52e5ef8-4fd6-4ea3-9c3a-aa6f2e42ebed" admin_pass="FqVqFjhYw3Pt">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v3/servers/f52e5ef8-4fd6-4ea3-9c3a-aa6f2e42ebed" rel="self"/>
+  <atom:link href="http://openstack.example.com/servers/f52e5ef8-4fd6-4ea3-9c3a-aa6f2e42ebed" rel="bookmark"/>
+</server>
\ No newline at end of file