diff --git a/xep-0318.xml b/xep-0318.xml
index 6557b616..648201b4 100644
--- a/xep-0318.xml
+++ b/xep-0318.xml
@@ -54,7 +54,7 @@
     <p>Reqesting the uptime of a server or component is done by sending a directed presence probe to the XMPP entity of interest. The request is shown in the following example.</p>
     <example caption='Request for Uptime Reporting using Presence Probe'><![CDATA[
 <presence from='juliet@capulet.com/balcony' to='montague.com' type='probe' />]]></example>
-    <p>The server or component then responds with an available presence, extended with delayed delivery information, according to &xep0203;, indicating its startup time. This is shown below:</p>
+    <p>The server or component then responds with an available presence, extended with delayed delivery information, according to <cite>XEP-0203</cite>, indicating its startup time. This is shown below:</p>
     <example caption='Response to the Presence Probe'><![CDATA[
 <presence from='montague.com' to='juliet@capulet.com/balcony'>
   <delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:41:07Z'/>
diff --git a/xep-0319.xml b/xep-0319.xml
index 2e935494..05eb4d74 100644
--- a/xep-0319.xml
+++ b/xep-0319.xml
@@ -65,7 +65,7 @@
 </section1>
 <section1 topic='Security Considerations' anchor='security'>
   <p>Including a last user interaction notation in presence notifications can enable those who receive such notifications to determine exactly when a user has stopped interacting with his or her XMPP client or even their system, but this information is in essence already available if the user publishes timely presence updates. Therefore, this specification introduces no new vulnerabilities.</p>
-  <p>It's worth to note that the security considerations of &xep0082; apply here.</p>
+  <p>It's worth to note that the security considerations of <cite>XEP-0082</cite> apply here.</p>
 </section1>
 <section1 topic='IANA Considerations' anchor='iana'>
   <p>This document requires no interaction with &IANA;.</p>