diff --git a/xep.ent b/xep.ent
index 271f8218..3c585d25 100644
--- a/xep.ent
+++ b/xep.ent
@@ -632,6 +632,8 @@ THE SOFTWARE.
 <!ENTITY rfc6716 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6716'>RFC 6716</link></span> <note>RFC 6716: Definition of the Opus Audio Codec &lt;<link url='http://tools.ietf.org/html/rfc6716'>http://tools.ietf.org/html/rfc6716</link>&gt;.</note>" >
 <!ENTITY rfc6762 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6762'>RFC 6762</link></span> <note>RFC 6762: Multicast DNS &lt;<link url='http://tools.ietf.org/html/rfc6762'>http://tools.ietf.org/html/rfc6762</link>&gt;.</note>" >
 <!ENTITY rfc6763 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6763'>RFC 6763</link></span> <note>RFC 6763: DNS-Based Service Discovery &lt;<link url='http://tools.ietf.org/html/rfc6763'>http://tools.ietf.org/html/rfc6763</link>&gt;.</note>" >
+<!ENTITY rfc6920 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6920'>RFC 6920</link></span> <note>RFC 6920: Naming Things with Hashes &lt;<link url='http://tools.ietf.org/html/rfc6920'>http://tools.ietf.org/html/rfc6920</link>&gt;.</note>" >
+<!ENTITY rfc7081 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7081'>RFC 7081</link></span> <note>RFC 7081: CUSAX: Combined Use of the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/rfc7081'>http://tools.ietf.org/html/rfc7081</link>&gt;.</note>" >
 
 <!-- Internet-Drafts -->
 
@@ -692,11 +694,11 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xmppe2e "<span class='ref'><link url='http://tools.ietf.org/html/rfc3923'>XMPP E2E</link></span> <note>RFC 3923: End-to-End Signing and Object Encryption for the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/rfc3923'>http://tools.ietf.org/html/rfc3923</link>&gt;.</note>" >
 <!ENTITY xmppim "<span class='ref'><link url='http://tools.ietf.org/html/rfc6121'>XMPP IM</link></span> <note>RFC 6121: Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence &lt;<link url='http://tools.ietf.org/html/rfc6121'>http://tools.ietf.org/html/rfc6121</link>&gt;.</note>" >
 <!ENTITY xmppiri "<span class='ref'><link url='http://tools.ietf.org/html/rfc5122'>XMPP URI Scheme</link></span> <note>Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/rfc5122'>http://tools.ietf.org/html/rfc5122</link>&gt;.</note>" >
-<!ENTITY xmppsipchat "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-chat'>draft-saintandre-sip-xmpp-chat</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): One-to-One Text Chat &lt;<link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-chat'>http://tools.ietf.org/html/draft-saintandre-sip-xmpp-chat</link>&gt; (work in progress).</note>" >
-<!ENTITY xmppsipcore "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-core'>draft-saintandre-sip-xmpp-core</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Core &lt;<link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-core'>http://tools.ietf.org/html/draft-saintandre-sip-xmpp-core</link>&gt; (work in progress).</note>" >
-<!ENTITY xmppsipim "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-im'>draft-saintandre-sip-xmpp-im</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Instant Messaging &lt;<link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-im'>http://tools.ietf.org/html/draft-saintandre-sip-xmpp-im</link>&gt; (work in progress).</note>" >
-<!ENTITY xmppsipmedia "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-media'>draft-saintandre-sip-xmpp-media</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Media Sessions &lt;<link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-media'>http://tools.ietf.org/html/draft-saintandre-sip-xmpp-media</link>&gt; (work in progress).</note>" >
-<!ENTITY xmppsippresence "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-presence'>draft-saintandre-sip-xmpp-presence</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Presence &lt;<link url='http://tools.ietf.org/html/draft-saintandre-sip-xmpp-presence'>http://tools.ietf.org/html/draft-saintandre-sip-xmpp-presence</link>&gt; (work in progress).</note>" >
+<!ENTITY stoxchat "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-stox-chat'>draft-ietf-stox-chat</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): One-to-One Text Chat &lt;<link url='http://tools.ietf.org/html/draft-ietf-stox-chat'>http://tools.ietf.org/html/draft-ietf-stox-chat</link>&gt; (work in progress).</note>" >
+<!ENTITY stoxcore "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-stox-core'>draft-ietf-stox-core</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Core &lt;<link url='http://tools.ietf.org/html/draft-ietf-stox-core'>http://tools.ietf.org/html/draft-ietf-stox-core</link>&gt; (work in progress).</note>" >
+<!ENTITY stoxim "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-stox-im'>draft-ietf-stox-im</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Instant Messaging &lt;<link url='http://tools.ietf.org/html/draft-ietf-stox-im'>http://tools.ietf.org/html/draft-ietf-stox-im</link>&gt; (work in progress).</note>" >
+<!ENTITY stoxmedia "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-stox-media'>draft-ietf-stox-media</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Media Sessions &lt;<link url='http://tools.ietf.org/html/draft-ietf-stox-media'>http://tools.ietf.org/html/draft-ietf-stox-media</link>&gt; (work in progress).</note>" >
+<!ENTITY stoxpresence "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-stox-presence'>draft-ietf-stox-presence</link></span> <note>Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Presence &lt;<link url='http://tools.ietf.org/html/draft-ietf-stox-presence'>http://tools.ietf.org/html/draft-ietf-stox-presence</link>&gt; (work in progress).</note>" >
 <!ENTITY xmppurn "<span class='ref'><link url='http://tools.ietf.org/html/rfc4854'>XMPP URNs</link></span> <note>A Uniform Resource Name (URN) Namespace for Extensions to the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/rfc4854'>http://tools.ietf.org/html/rfc4854</link>&gt;.</note>" >
 <!ENTITY xtls "<span class='ref'><link url='http://tools.ietf.org/html/draft-meyer-xmpp-e2e-encryption'>Jingle XTLS</link></span> <note>Extensible Messaging and Presence Protocol (XMPP) End-to-End Encryption Using Transport Layer Security (&quot;XTLS&quot;) &lt;<link url='http://tools.ietf.org/html/draft-meyer-xmpp-e2e-encryption'>http://tools.ietf.org/html/draft-meyer-xmpp-e2e-encryption</link>&gt;.</note>" >
 <!ENTITY saslext "<span class='ref'><link url='http://tools.ietf.org/html/draft-meyer-xmpp-sasl-cert-management'>Client Certificate Management for SASL EXTERNAL</link></span> <note>Management and Use of Client Certificates for the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/draft-meyer-xmpp-sasl-cert-management'>http://tools.ietf.org/html/draft-meyer-xmpp-sasl-cert-management</link>&gt;.</note>" >