diff --git a/xep.ent b/xep.ent
index b8fe81e5..53afdf7c 100644
--- a/xep.ent
+++ b/xep.ent
@@ -596,12 +596,12 @@ THE SOFTWARE.
 <!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>" >
+<!ENTITY rfc6125 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6125'>RFC 6125</link></span> <note> RFC 6125:Representation and Verification of Domain-Based Application Service Identity within Internet Public Key Infrastructure Using X.509 (PKIX) Certificates in the Context of Transport Layer Security (TLS) &lt;<link url='http://tools.ietf.org/html/rfc6125'>http://tools.ietf.org/html/rfc6125</link>&gt;.</note>" >
 <!ENTITY rfc6189 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6189'>RFC 6189</link></span> <note>ZRTP: Media Path Key Agreement for Unicast Secure RTP &lt;<link url='http://tools.ietf.org/html/rfc6189'>http://tools.ietf.org/html/rfc6189</link>&gt;.</note>" >
 
 <!-- Internet-Drafts -->
 
 <!ENTITY atomsub "<span class='ref'><link url='http://xmpp.org/internet-drafts/draft-saintandre-atompub-notify-07.html'>AtomSub</link></span> <note>Atomsub: Transporting Atom Notifications over the Publish-Subscribe Extension to the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://xmpp.org/internet-drafts/draft-saintandre-atompub-notify-07.html'>http://xmpp.org/internet-drafts/draft-saintandre-atompub-notify-07.html</link>&gt;. Work in progress.</note>" >
-<!ENTITY certid "<span class='ref'><link url='http://tools.ietf.org/html/draft-saintandre-tls-server-id-check'>CertID</link></span> <note> &lt;<link url='http://tools.ietf.org/html/draft-saintandre-tls-server-id-check'>http://tools.ietf.org/html/draft-saintandre-tls-server-id-check</link>&gt;. Work in progress.</note>" >
 <!ENTITY dnssd "<span class='ref'><link url='http://tools.ietf.org/html/draft-cheshire-dnsext-dns-sd'>DNS-Based Service Discovery</link></span> <note>DNS-Based Service Discovery &lt;<link url='http://tools.ietf.org/html/draft-cheshire-dnsext-dns-sd'>http://tools.ietf.org/html/draft-cheshire-dnsext-dns-sd</link>&gt;. Work in progress.</note>" >
 <!ENTITY dtlssrtp "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-avt-dtls-srtp'>DTLS-SRTP</link></span> <note>Datagram Transport Layer Security (DTLS) Extension to Establish Keys for Secure Real-time Transport Protocol (SRTP) &lt;<link url='http://tools.ietf.org/html/draft-ietf-avt-dtls-srtp'>http://tools.ietf.org/html/draft-ietf-avt-dtls-srtp</link>&gt;. Work in progress.</note>" >
 <!ENTITY geoprivpol "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-geopriv-policy'>Geopriv Policy</link></span> <note>Geopriv Policy &lt;<link url='http://tools.ietf.org/html/draft-ietf-geopriv-policy'>http://tools.ietf.org/html/draft-ietf-geopriv-policy</link>&gt;. Work in progress.</note>" >