diff --git a/xep-0053.xml b/xep-0053.xml
index db38be75..8c16d469 100644
--- a/xep-0053.xml
+++ b/xep-0053.xml
@@ -93,7 +93,7 @@
     <li>
       <p>When the XMPP Council votes to advance the XEP to a status of Draft, the XMPP Registrar shall generate official names for all namespaces specified in the XEP. The following considerations apply:</p>
       <ol>
-        <li>Each name shall adhere to the format defined in &xmppurn;.</li>
+        <li>Each name shall adhere to the format defined in &rfc4854;.</li>
         <li>The "ShortName" string shall be unique within the XMPP URN tree and any "SubName" strings shall be unique within the scope of the ShortName.  All such strings should be relevant and memorable, and may be determined in consultation with the author(s) of the XEP.</li>
         <li>Each name shall be checked against the registry of existing names located at &NAMESPACES; to ensure that no duplicate names are issued.</li>
         <li>The XMPP Registrar shall issue all XMPP URNs directly and shall not assign secondary responsibility for management of any sub-trees.</li>
diff --git a/xep.ent b/xep.ent
index 8b70e182..0bf4d191 100644
--- a/xep.ent
+++ b/xep.ent
@@ -417,6 +417,7 @@
 <!ENTITY rfc4648 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4648'>RFC 4648</link></span> <note>RFC 4648: The Base16, Base32, and Base64 Data Encodings &lt;<link url='http://tools.ietf.org/html/rfc4648'>http://tools.ietf.org/html/rfc4648</link>&gt;.</note>" >
 <!ENTITY rfc4732 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4732'>RFC 4732</link></span> <note>RFC 4732: Internet Denial-of-Service Considerations &lt;<link url='http://tools.ietf.org/html/rfc4732'>http://tools.ietf.org/html/rfc4732</link>&gt;.</note>" >
 <!ENTITY rfc4733 "<span class='ref'><link url='http://tools.ietf.org/html/rfc4733'>RFC 4733</link></span> <note>RFC 4733: RTP Payload for DTMF Digits, Telephony Tones, and Telephony Signals &lt;<link url='http://tools.ietf.org/html/rfc4733'>http://tools.ietf.org/html/rfc4733</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>" >
 
 <!-- Internet-Drafts -->
 
@@ -458,7 +459,7 @@
 <!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 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/draft-saintandre-xmpp-urn'>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/draft-saintandre-xmpp-urn'>http://tools.ietf.org/html/draft-saintandre-xmpp-urn</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>" >
 
 <!-- Frequent Extension Authors -->