diff --git a/xep-0368.xml b/xep-0368.xml
index d8cc12f7..2d308228 100644
--- a/xep-0368.xml
+++ b/xep-0368.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
-<!ENTITY rfc7301 "<span class='ref'><link url='https://tools.ietf.org/html/rfc7301'>RFC 7301</link></span> <note>RFC 7301: Transport Layer Security (TLS) Application-Layer Protocol Negotiation Extension &lt;<link url='https://tools.ietf.org/html/rfc7301'>https://tools.ietf.org/html/rfc7301</link>&gt;.</note>" >
-<!ENTITY rfc7590 "<span class='ref'><link url='https://tools.ietf.org/html/rfc7590'>RFC 7590</link></span> <note>RFC 7590: Use of Transport Layer Security (TLS) in the
-           Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='https://tools.ietf.org/html/rfc7590'>https://tools.ietf.org/html/rfc7590</link>&gt;.</note>" >
-<!ENTITY rfc2595 "<span class='ref'><link url='https://tools.ietf.org/html/rfc2595'>RFC 2595</link></span> <note>RFC 2595: Using TLS with IMAP, POP3 and ACAP - Section 7 &lt;<link url='https://tools.ietf.org/html/rfc2595'>https://tools.ietf.org/html/rfc2595</link>&gt;.</note>" >
 ]>
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
diff --git a/xep.ent b/xep.ent
index 1acb4763..d8294c17 100644
--- a/xep.ent
+++ b/xep.ent
@@ -671,6 +671,7 @@ THE SOFTWARE.
 <!ENTITY rfc7613 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7613'>RFC 7613</link></span> <note>RFC 7613: Preparation, Enforcement, and Comparison of Internationalized Strings Representing Usernames and Passwords&lt;<link url='http://tools.ietf.org/html/rfc7613'>http://tools.ietf.org/html/rfc7613</link>&gt;.</note>" >
 <!ENTITY rfc7622 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7622'>RFC 7622</link></span> <note>RFC 7622: Extensible Messaging and Presence Protocol (XMPP): Address Format &lt;<link url='http://tools.ietf.org/html/rfc7622'>http://tools.ietf.org/html/rfc7622</link>&gt;.</note>" >
 <!ENTITY rfc7627 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7627'>RFC 7627</link></span> <note>RFC 7627: Transport Layer Security (TLS) Session Hash and Extended Master Secret Extension &lt;<link url='http://tools.ietf.org/html/rfc7627'>http://tools.ietf.org/html/rfc7627</link>&gt;.</note>" >
+<!ENTITY rfc7301 "<span class='ref'><link url='https://tools.ietf.org/html/rfc7301'>RFC 7301</link></span> <note>RFC 7301: Transport Layer Security (TLS) Application-Layer Protocol Negotiation Extension &lt;<link url='https://tools.ietf.org/html/rfc7301'>https://tools.ietf.org/html/rfc7301</link>&gt;.</note>" >
 <!ENTITY rfc7395 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7395'>RFC 7395</link></span> <note>RFC 7395: An Extensible Messaging and Presence Protocol (XMPP) Subprotocol for WebSocket &lt;<link url='http://tools.ietf.org/html/rfc7395'>http://tools.ietf.org/html/rfc7395</link>&gt;.</note>" >
 <!ENTITY rfc7693 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7693'>RFC 7693</link></span> <note>RFC 7693: The BLAKE2 Cryptographic Hash and Message Authentication Code (MAC) &lt;<link url='http://tools.ietf.org/html/rfc7693'>http://tools.ietf.org/html/rfc7693</link>&gt;.</note>" >
 <!ENTITY rfc7564 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7564'>RFC 7564</link></span> <note>RFC 7564: PRECIS Framework: Preparation, Enforcement, and Comparison of Internationalized Strings in Application Protocols &lt;<link url='http://tools.ietf.org/html/rfc7564'>http://tools.ietf.org/html/rfc7564</link>&gt;.</note>" >