diff --git a/xep-0156.xml b/xep-0156.xml
index 75dffcd4..d10b2bdd 100644
--- a/xep-0156.xml
+++ b/xep-0156.xml
@@ -25,6 +25,14 @@
   &hildjj;
   &stpeter;
   &lance;
+  <revision>
+    <version>1.1.3</version>
+    <date>2018-07-21</date>
+    <initials>egp</initials>
+    <remark>
+      <p>Replace references to draft-ietf-xmpp-websocket with RFC7395 (XMPP over WebSocket).</p>
+    </remark>
+  </revision>
   <revision>
     <version>1.1.2</version>
     <date>2016-06-07</date>
@@ -181,7 +189,7 @@ _xmppconnect IN TXT "_xmpp-client-websocket=wss://web.example.com:443/ws"
   </section2>
 
   <section2 topic='Examples' anchor='httpexamples'>
-    <p>The following examples show two host-meta link records: the first indicates support for the XMPP Over BOSH connection method defined in <cite>XEP-0124</cite> and <cite>XEP-0206</cite> and the second indicates support for the XMPP Over WebSocket connection method defined in <cite>draft-ietf-xmpp-websocket</cite>.</p>
+    <p>The following examples show two host-meta link records: the first indicates support for the XMPP Over BOSH connection method defined in <cite>XEP-0124</cite> and <cite>XEP-0206</cite> and the second indicates support for the XMPP Over WebSocket connection method defined in &rfc7395;.</p>
     <p>As specified in <cite>RFC 6120</cite> &sect;3, support for the XML encoding of the host-meta resource is REQUIRED while alternative representations such as JSON are OPTIONAL.</p>
     <example caption='Result for /.well-known/host-meta'><![CDATA[<?xml version='1.0' encoding=utf-8'?>
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
diff --git a/xep-0198.xml b/xep-0198.xml
index e0be2b11..e6bf26b1 100644
--- a/xep-0198.xml
+++ b/xep-0198.xml
@@ -28,6 +28,12 @@
   &fabio;
   &dcridland;
   &mwild;
+  <revision>
+    <version>1.5.4</version>
+    <date>2018-07-19</date>
+    <initials>egp</initials>
+    <remark><p>Mark 'h' element as xs:unsignedInt in the schema too, it is already specified to be a 32-bit wrapping unsigned integer in the text.</p></remark>
+  </revision>
   <revision>
     <version>1.5.3</version>
     <date>2018-06-29</date>
@@ -567,7 +573,7 @@
       <xs:simpleContent>
         <xs:extension base='empty'>
           <xs:attribute name='h'
-                        type='xs:integer'
+                        type='xs:unsignedInt'
                         use='required'/>
         </xs:extension>
       </xs:simpleContent>
diff --git a/xep-0305.xml b/xep-0305.xml
index 421d2e1c..5fd470b6 100644
--- a/xep-0305.xml
+++ b/xep-0305.xml
@@ -56,7 +56,7 @@
 </section1>
 
 <section1 topic='Preparing to Connect' anchor='prepare'>
-  <p>In accordance with &rfc6120;, before attempting to establish a stream over TCP the initiating entity needs to determine the IP address and port at which to connect, usually by means of DNS lookups as described in Section 3.2 of <cite>RFC 6120</cite>. Implementations SHOULD cache the results of DNS lookups in order to avoid this step whenever possible. Similar considerations apply to connections established over one of the HTTP bindings, i.e., either BOSH (see &xep0124; and &xep0206;) or WebSocket (see &rfc6455; and &xmppoverwebsocket;).</p>
+  <p>In accordance with &rfc6120;, before attempting to establish a stream over TCP the initiating entity needs to determine the IP address and port at which to connect, usually by means of DNS lookups as described in Section 3.2 of <cite>RFC 6120</cite>. Implementations SHOULD cache the results of DNS lookups in order to avoid this step whenever possible. Similar considerations apply to connections established over one of the HTTP bindings, i.e., either BOSH (see &xep0124; and &xep0206;) or WebSocket (see &rfc6455; and &rfc7395;).</p>
   <p>XMPP applications SHOULD cache whatever information they can about the peer, especially stream features data and &xep0030; information. To facilitate such caching, servers SHOULD include &xep0115; data in stream features as shown in Section 6.3 of <cite>XEP-0115</cite>. Note that for maximum benefit the server MUST include all of the stream features it supports in its replies to "disco#info" queries (i.e., not advertise such features only during stream establishment).</p>
   <p>XMPP clients SHOULD cache roster information, and servers SHOULD make such caching possible, using &xep0237; as subsequently included in Section 2.1.1 of &rfc6121;.</p>
 </section1>
diff --git a/xep-0365.xml b/xep-0365.xml
index 096cfb79..8397ea92 100644
--- a/xep-0365.xml
+++ b/xep-0365.xml
@@ -30,6 +30,14 @@
     <email>steve.kille@isode.com</email>
     <jid>steve.kille@isode.com</jid>
   </author>
+  <revision>
+    <version>0.2.1</version>
+    <date>2018-07-21</date>
+    <initials>egp</initials>
+    <remark>
+      <p>Replace references to draft-ietf-xmpp-websocket with RFC7395 (XMPP over WebSocket).</p>
+    </remark>
+  </revision>
   <revision>
     <version>0.2</version>
     <date>2017-09-11</date>