diff --git a/xep-0235.xml b/xep-0235.xml
index 272ff99e..c64f51ce 100644
--- a/xep-0235.xml
+++ b/xep-0235.xml
@@ -21,6 +21,12 @@
   <supersededby/>
   <shortname>NOT_YET_ASSIGNED</shortname>
   &stpeter;
+  <revision>
+    <version>0.6</version>
+    <date>2008-08-07</date>
+    <initials>psa</initials>
+    <remark><p>Clarified error handling and service discovery.</p></remark>
+  </revision>
   <revision>
     <version>0.5</version>
     <date>2008-08-07</date>
@@ -181,10 +187,91 @@ oauth_version%3D1.0
   ]]></code>
 </section1>
 
-<section1 topic='Determining Support' anchor='support'>
-  <p>If a service provides and accepts authorization tokens, it MUST advertise support for the 'urn:xmpp:tmp:oauth' namespace in its disco#info replies (if provided) its &xep0115; notations &NSNOTE;.</p>
+<section1 topic='Error Handling' anchor='error'>
+  <p>If a Service Provider rejects a Consumer's access request, the Service Provider SHOULD return either a &badrequest; or &notauthorized; stanza error, with an appropriate OAuth-specific error condition as described in the following table.</p>
+
+  <table caption='Application-Specific Error Conditions'>
+    <tr>
+      <th>OAuth-Specific Condition</th>
+      <th>Generic Condition</th>
+    </tr>
+    <tr>
+      <td>&lt;duplicated-parameter/&gt;</td>
+      <td>&badrequest;</td>
+    </tr>
+    <tr>
+      <td>&lt;invalid-consumer-key/&gt;</td>
+      <td>&notauthorized;</td>
+    </tr>
+    <tr>
+      <td>&lt;invalid-nonce/&gt;</td>
+      <td>&notauthorized;</td>
+    </tr>
+    <tr>
+      <td>&lt;invalid-signature/&gt;</td>
+      <td>&notauthorized;</td>
+    </tr>
+    <tr>
+      <td>&lt;invalid-token/&gt;</td>
+      <td>&notauthorized;</td>
+    </tr>
+    <tr>
+      <td>&lt;missing-parameter/&gt;</td>
+      <td>&badrequest;</td>
+    </tr>
+    <tr>
+      <td>&lt;token-required/&gt;</td>
+      <td>&notauthorized;</td>
+    </tr>
+    <tr>
+      <td>&lt;unsupported-parameter/&gt;</td>
+      <td>&badrequest;</td>
+    </tr>
+    <tr>
+      <td>&lt;unsupported-signature-method/&gt;</td>
+      <td>&badrequest;</td>
+    </tr>
+  </table>
+  <p>An example follows.</p>
+  <example caption='OAuth-specific error'><![CDATA[
+<iq from='feeds.worldgps.tld'
+    id='sub1'
+    to='travelbot@findmenow.tld/bot'
+    type='error'>
+  <error type='modify'>
+    <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <invalid-nonce xmlns='urn:xmpp:tmp:oauth:errors'/>
+  </error>
+</iq>
+  ]]></example>
 </section1>
 
+<section1 topic='Determining Support' anchor='support'>
+  <p>If an entity supports the protocol specified herein, it MUST advertise that fact by returning a feature of "urn:xmpp:tmp:oauth" in response to &xep0030; information requests &NSNOTE;.</p>
+  <example caption="Service discovery information request"><![CDATA[
+<iq from='travelbot@findmenow.tld/bot'
+    id='disco1'
+    to='feeds.worldgps.tld'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+  ]]></example>
+  <example caption="Service discovery information response"><![CDATA[
+<iq from='feeds.worldgps.tld'
+    id='disco1'
+    to='travelbot@findmenow.tld/bot'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    ...
+    <feature var='urn:xmpp:tmp:bob'/>
+    ...
+  </query>
+</iq>
+  ]]></example>
+  <p>In order for an application to determine whether an entity supports this protocol, where possible it SHOULD via the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.</p>
+</section1>
+
+
 <section1 topic='Security Considerations' anchor='security'>
   <section2 topic='Replay Attacks' anchor='security-replay'>
     <p>Signatures generated according to the signature generation algorithm might be subject to replay attacks. However, inclusion of the XMPP "from" and "to" addresses limits these attacks to compromised servers or client-to-server connections. In addition, inclusion of the nonce value also helps to prevent replay attacks.</p>
@@ -205,7 +292,8 @@ oauth_version%3D1.0
 </section1>
 
 <section1 topic='XML Schema' anchor='schema'>
-  <code><![CDATA[
+  <section2 topic='Protocol Namespace' anchor='schema-proto'>
+    <code><![CDATA[
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xs:schema
@@ -228,6 +316,29 @@ oauth_version%3D1.0
     </xs:complexType>
   </xs:element>
 
+</xs:schema>
+    ]]></code>
+  </section2>
+  <section2 topic='Error Namespace' anchor='schema-error'>
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='urn:xmpp:tmp:oauth:errors'
+    xmlns='urn:xmpp:tmp:oauth:errors'
+    elementFormDefault='qualified'>
+
+  <xs:element name='duplicated-parameter' type='empty'/>
+  <xs:element name='invalid-consumer-key' type='empty'/>
+  <xs:element name='invalid-nonce' type='empty'/>
+  <xs:element name='invalid-signature' type='empty'/>
+  <xs:element name='invalid-token' type='empty'/>
+  <xs:element name='missing-parameter' type='empty'/>
+  <xs:element name='token-required' type='empty'/>
+  <xs:element name='unsupported-parameter' type='empty'/>
+  <xs:element name='unsupported-signature-method' type='empty'/>
+
   <xs:simpleType name='empty'>
     <xs:restriction base='xs:string'>
       <xs:enumeration value=''/>
@@ -235,7 +346,8 @@ oauth_version%3D1.0
   </xs:simpleType>
 
 </xs:schema>
-  ]]></code>
+    ]]></code>
+  </section2>
 </section1>
 
 <section1 topic='Acknowledgements' anchor='ack'>