diff --git a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.xml b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.xml
new file mode 100644
index 00000000000..2b384b4fd7c
--- /dev/null
+++ b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.xml
@@ -0,0 +1,11 @@
+<queue-entries>
+  <queue>
+    <name>pull-queue</name>
+    <mode>pull</mode>
+    <acl>
+      <user-email>bar@foo.com</user-email>      <!-- can list, get, lease, delete, and update tasks -->
+      <writer-email>user@gmail.com</user-email> <!--  can insert tasks, in addition to rights granted by being a user_email above -->
+      <writer-email>bar@foo.com</writer-email>  <!--  can insert tasks, in addition to rights granted by being a user_email above -->
+    </acl>
+  </queue>
+</queue-entries>
diff --git a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.yaml b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.yaml
deleted file mode 100644
index e0c1aadd10b..00000000000
--- a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/queue.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-queue:
-- name: pull-queue
-  mode: pull
-  acl:
-  - user_email: bar@foo.com      # can list, get, lease, delete, and update tasks
-  - writer_email: user@gmail.com # can insert tasks
-  - writer_email: bar@foo.com    # can insert tasks, in addition to rights granted by being a user_email above
diff --git a/taskqueue/pull/README.md b/taskqueue/pull/README.md
index 9837eed8785..ce77b24924e 100644
--- a/taskqueue/pull/README.md
+++ b/taskqueue/pull/README.md
@@ -20,7 +20,7 @@ reuse an existing project by clicking on it.
       1. Install [Google Cloud SDK](https://cloud.google.com/sdk/)
       1. Run the following command to authorize the Cloud SDK and configure your project:
       <pre>gcloud init</pre>
-      1. Add your authenticated email account as 'user_email' and 'writer_email' elements to the queue.yaml 
+      1. Add your authenticated email account as '&lt;user-email&gt;' and '&lt;writer-email&gt;' elements to the queue.xml 
       file of the App Engine app that created the pull queue task you're trying to access. For more details, please see 
       [Defining Pull Queues](https://cloud.google.com/appengine/docs/java/taskqueue/overview-pull#Java_Defining_pull_queues).
   * Running the sample on a Google Compute Engine VM using Default Application Credentials:
@@ -29,7 +29,7 @@ reuse an existing project by clicking on it.
         section click "Create credentials" and choose "Service account key".
         1. On the "Create service account key" page, select "Compute Engine default service account" from the "Service Account" drop-down menu. Leave the Key type set to JSON and click the "Create" button.
         1. Once the service account is created, click the "Manage service accounts" link and copy the "Service account ID" of the "Compute Engine default service account".
-        1.  Add the "Service account ID" as 'user_email' and 'writer_email' elements to the queue.yaml file of the 
+        1.  Add the "Service account ID" as '&lt;user-email&gt;' and '&lt;writer-email&gt;' elements to the queue.xml file of the 
         App Engine app that created the pull queue task you're trying to access. For more details, please see 
         [Defining Pull Queues](https://cloud.google.com/appengine/docs/java/taskqueue/overview-pull#Java_Defining_pull_queues).