diff --git a/xep.ent b/xep.ent
index 08387f56..d0f34040 100644
--- a/xep.ent
+++ b/xep.ent
@@ -595,6 +595,9 @@ THE SOFTWARE.
 <!ENTITY rfc5802 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5802'>RFC 5802</link></span> <note>RFC 5802: Salted Challenge Response Authentication Mechanism (SCRAM) SASL and GSS-API Mechanisms &lt;<link url='http://tools.ietf.org/html/rfc5802'>http://tools.ietf.org/html/rfc5802</link>&gt;.</note>" >
 <!ENTITY rfc5952 "<span class='ref'><link url='http://tools.ietf.org/html/rfc5952'>RFC 5952</link></span> <note>RFC 5952: A Recommendation for IPv6 Address Text Representation &lt;<link url='http://tools.ietf.org/html/rfc5952'>http://tools.ietf.org/html/rfc5952</link>&gt;.</note>" >
 <!ENTITY rfc6051 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6051'>RFC 6051</link></span> <note>RFC 6051: Rapid Synchronisation of RTP Flows &lt;<link url='http://tools.ietf.org/html/rfc6051'>http://tools.ietf.org/html/rfc6051</link>&gt;.</note>" >
+<!ENTITY rfc6120 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6120'>RFC 6120</link></span> <note>RFC 6120: Extensible Messaging and Presence Protocol (XMPP): Core &lt;<link url='http://tools.ietf.org/html/rfc6120'>http://tools.ietf.org/html/rfc6120</link>&gt;.</note>" >
+<!ENTITY rfc6121 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6121'>RFC 6121</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 rfc6122 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6122'>RFC 6122</link></span> <note>RFC 6122: Extensible Messaging and Presence Protocol (XMPP): Address Format &lt;<link url='http://tools.ietf.org/html/rfc6122'>http://tools.ietf.org/html/rfc6122</link>&gt;.</note>" >
 
 <!-- Internet-Drafts -->
 
@@ -645,8 +648,8 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY rfc3921bis "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-xmpp-3921bis'>rfc3921bis</link></span> <note>rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence &lt;<link url='http://tools.ietf.org/html/draft-ietf-xmpp-3921bis'>http://tools.ietf.org/html/draft-ietf-xmpp-3921bis</link>&gt;. (work in progress)</note>" >
 
 <!ENTITY xmpp "<span class='ref'><link url='http://xmpp.org/'>XMPP</link></span> <note>Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://xmpp.org/'>http://xmpp.org/</link>&gt;.</note>" >
-<!ENTITY xmppcore "<span class='ref'><link url='http://tools.ietf.org/html/rfc3920'>XMPP Core</link></span> <note>RFC 3920: Extensible Messaging and Presence Protocol (XMPP): Core &lt;<link url='http://tools.ietf.org/html/rfc3920'>http://tools.ietf.org/html/rfc3920</link>&gt;.</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 xmppcore "<span class='ref'><link url='http://tools.ietf.org/html/rfc6120'>XMPP Core</link></span> <note>RFC 6120: Extensible Messaging and Presence Protocol (XMPP): Core &lt;<link url='http://tools.ietf.org/html/rfc6120'>http://tools.ietf.org/html/rfc6120</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 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/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>" >