diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml
index 032d1f1e269..efe638217ee 100644
--- a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml
@@ -18,11 +18,13 @@
   <version>YOUR-VERSION-ID</version>
   <threadsafe>true</threadsafe>
 
+  <!-- [START handling_incoming_calls] -->
   <inbound-services>
     <service>xmpp_message</service>
     <service>xmpp_presence</service>
     <service>xmpp_subscribe</service>
     <service>xmpp_error</service>
   </inbound-services>
+  <!-- [END handling_incoming_calls] -->
 
 </appengine-web-app>
diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/web.xml
index 45daddaf86e..5bbb66f21c2 100644
--- a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/xmpp/src/main/webapp/WEB-INF/web.xml
@@ -25,6 +25,7 @@
     <servlet-name>error</servlet-name>
     <url-pattern>/_ah/xmpp/error/</url-pattern>
   </servlet-mapping>
+  <!-- [START messagereceiver] -->
   <servlet>
     <servlet-name>messagereceiver</servlet-name>
     <servlet-class>com.example.appengine.xmpp.MessageReceiverServlet</servlet-class>
@@ -34,6 +35,7 @@
     <url-pattern>/_ah/xmpp/message/chat/</url-pattern>
   </servlet-mapping>
   <servlet>
+  <!-- [END messagereceiver] -->
     <servlet-name>messagesender</servlet-name>
     <servlet-class>com.example.appengine.xmpp.MessageSenderServlet</servlet-class>
   </servlet>