diff --git a/xep.ent b/xep.ent
index eb3de096..65303967 100644
--- a/xep.ent
+++ b/xep.ent
@@ -316,6 +316,7 @@
 <!ENTITY icestandard "<span class='ref'><link url='http://www.icestandard.org/'>Information and Content Exchange</link></span> <note>Information and Content Exchange &lt;<link url='http://www.icestandard.org/'>http://www.icestandard.org/</link>&gt;.</note>" >
 <!ENTITY iso8601 "<span class='ref'><link url='http://www.cl.cam.ac.uk/~mgk25/iso-time.html'>ISO 8601</link></span> <note>ISO 8601: Representation of Dates and Times (2000). This specification is not freely available; however, a good summary is located at &lt;<link url='http://www.cl.cam.ac.uk/~mgk25/iso-time.html'>http://www.cl.cam.ac.uk/~mgk25/iso-time.html</link>&gt;.</note>" >
 <!ENTITY itue164 "<span class='ref'><link url='http://en.wikipedia.org/wiki/E.164'>ITU E.164</link></span> <note>ITU Recommendation E.164/I.331: The International Public Telecommunication Numbering Plan (1997). This specification is not freely available; a short summary is located at &lt;<link url='http://en.wikipedia.org/wiki/E.164'>http://en.wikipedia.org/wiki/E.164</link>&gt;.</note>" >
+<!ENTITY oauth "<span class='ref'><link url='http://oauth.net/core/1.0/'>OAuth</link></span> <note>OAuth Core 1.0 &lt;<link url='http://oauth.net/core/1.0/'>http://oauth.net/core/1.0/</link>&gt;.</note>" >
 <!ENTITY petnames "<span class='ref'><link url='http://www.skyhunter.com/marcs/petnames/IntroPetNames.html'>Introduction to Petname Systems</link></span> <note>Introduction to Petname Systems &lt;<link url='http://www.skyhunter.com/marcs/petnames/IntroPetNames.html'>http://www.skyhunter.com/marcs/petnames/IntroPetNames.html</link>&gt;.</note>" >
 <!ENTITY rtf "<span class='ref'><link url='http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp'>Rich Text Format (RTF)</link></span> <note>Rich Text Format (RTF) Version 1.5 Specification &lt;<link url='http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp'>http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp</link>&gt;.</note>" >
 <!ENTITY unicode "<span class='ref'>Unicode</span> <note>The Unicode Standard, Version 3.2.0 (The Unicode Consortium, 2000).</note>" >
@@ -497,6 +498,7 @@
 <!ENTITY rfc4848 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4848'>RFC 4848</link></span> <note>RFC 4848: Domain-Based Application Service Location Using URIs and the Dynamic Delegation Discovery Service (DDDS) &lt;<link url='http://tools.ietf.org/html/rfc4848'>http://tools.ietf.org/html/rfc4848</link>&gt;.</note>" >
 <!ENTITY rfc4854 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4854'>RFC 4854</link></span> <note>RFC 4854: 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 rfc4880 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4880'>RFC 4880</link></span> <note>RFC 4880: OpenPGP Message Format &lt;<link url='http://tools.ietf.org/html/rfc4880'>http://tools.ietf.org/html/rfc4880</link>&gt;.</note>" >
+<!ENTITY rfc5122 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5122'>RFC 5122</link></span> <note>RFC 5122: 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>" >
 
 <!-- Internet-Drafts -->
 
@@ -545,7 +547,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xmppim "<span class='ref'><link url='http://tools.ietf.org/html/rfc3921'>XMPP IM</link></span> <note>RFC 3921: Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence &lt;<link url='http://tools.ietf.org/html/rfc3921'>http://tools.ietf.org/html/rfc3921</link>&gt;.</note>" >
 <!ENTITY xmppcpim "<span class='ref'><link url='http://tools.ietf.org/html/rfc3922'>XMPP CPIM</link></span> <note>RFC 3922: Mapping the Extensible Messaging and Presence Protocol (XMPP) to Common Presence and Instant Messaging (CPIM) &lt;<link url='http://tools.ietf.org/html/rfc3922'>http://tools.ietf.org/html/rfc3922</link>&gt;.</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 xmppiri "<span class='ref'><link url='http://tools.ietf.org/html/rfc4622'>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/rfc4622'>http://tools.ietf.org/html/rfc4622</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 xmppsimple "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-xmpp-simple'>draft-saintandre-xmpp-simple</link></span> <note>Basic Messaging and Presence Interoperability between the Extensible Messaging and Presence Protocol (XMPP) and Session Initiation Protocol (SIP) for Instant Messaging and Presence Leveraging Extensions (SIMPLE) &lt;<link url='http://tools.ietf.org/html/draft-saintandre-xmpp-simple'>http://tools.ietf.org/html/draft-saintandre-xmpp-simple</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>" >
 
@@ -702,6 +704,22 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
         <jid>public@el-tramo.be</jid>
     </author>
 " >
+<!ENTITY dcridland "
+    <author>
+      <firstname>Dave</firstname>
+      <surname>Cridland</surname>
+      <email>dave.cridland@isode.com</email>
+      <jid>dave.cridland@isode.com</jid>
+    </author>
+" >
+<!ENTITY fabio "
+    <author>
+      <firstname>Fabio</firstname>
+      <surname>Forno</surname>
+      <email>fabio.forno@gmail.com</email>
+      <jid>ff@jabber.bluendo.com</jid>
+    </author>
+" >
 
 <!-- XMPP Extension Protocols -->
 
@@ -937,4 +955,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xep0234 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0234.html'>Jingle File Transfer</link></span> <note>XEP-0234: Jingle File Transfer &lt;<link url='http://www.xmpp.org/extensions/xep-0234.html'>http://www.xmpp.org/extensions/xep-0234.html</link>&gt;.</note>" >
 <!ENTITY xep0235 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0235.html'>Direct Invitations</link></span> <note>XEP-0235: Direct Invitations &lt;<link url='http://www.xmpp.org/extensions/xep-0235.html'>http://www.xmpp.org/extensions/xep-0235.html</link>&gt;.</note>" >
 <!ENTITY xep0236 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0236.html'>Abuse Reporting</link></span> <note>XEP-0236: Abuse Reporting &lt;<link url='http://www.xmpp.org/extensions/xep-0236.html'>http://www.xmpp.org/extensions/xep-0236.html</link>&gt;.</note>" >
-<!ENTITY xep0237 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0237.html'>Roster Versioning</link></span> <note>XEP-0237: Roster Versioning &lt;<link url='http://www.xmpp.org/extensions/xep-0237.html'>http://www.xmpp.org/extensions/xep-0237.html</link>&gt;.</note>" >
+<!ENTITY xep0237 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0237.html'>Roster Sequencing</link></span> <note>XEP-0237: Roster Sequencing &lt;<link url='http://www.xmpp.org/extensions/xep-0237.html'>http://www.xmpp.org/extensions/xep-0237.html</link>&gt;.</note>" >
+<!ENTITY xep0238 "<span class='ref'><link url='http://www.xmpp.org/extensions/xep-0238.html'>XMPP Protocol Flows for Inter-Domain Federation</link></span> <note>XEP-0238: XMPP Protocol Flows for Inter-Domain Federation &lt;<link url='http://www.xmpp.org/extensions/xep-0238.html'>http://www.xmpp.org/extensions/xep-0238.html</link>&gt;.</note>" >