diff --git a/xep.ent b/xep.ent
index 797388ce..8c2b1632 100644
--- a/xep.ent
+++ b/xep.ent
@@ -630,6 +630,7 @@ THE SOFTWARE.
 <!ENTITY rfc6443 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6443'>RFC 6443</link></span> <note>RFC 6443: Framework for Emergency Calling Using Internet Multimedia &lt;<link url='http://tools.ietf.org/html/rfc6443'>http://tools.ietf.org/html/rfc6443</link>&gt;.</note>" >
 <!ENTITY rfc6455 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6455'>RFC 6455</link></span> <note>RFC 6455: The WebSocket Protocol &lt;<link url='http://tools.ietf.org/html/rfc6455'>http://tools.ietf.org/html/rfc6455</link>&gt;.</note>" >
 <!ENTITY rfc6473 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6473'>RFC 6473</link></span> <note>RFC 6473: vCard KIND:application &lt;<link url='http://tools.ietf.org/html/rfc6473'>http://tools.ietf.org/html/rfc6351</link>&gt;.</note>" >
+<!ENTITY rfc6544 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6544'>TCP Candidates with Interactive Connectivity Establishment (ICE)</link></span> <note>TCP Candidates with Interactive Connectivity Establishment (ICE) &lt;<link url='http://tools.ietf.org/html/rfc6544'>http://tools.ietf.org/html/rfc6544</link>&gt;. Work in progress.</note>" >
 <!ENTITY rfc6648 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6648'>RFC 6648</link></span> <note>RFC 6648: Deprecating the X- Prefix and Similar Constructs in Application Protocols &lt;<link url='http://tools.ietf.org/html/rfc6648'>http://tools.ietf.org/html/rfc6648</link>&gt;.</note>" >
 <!ENTITY rfc6716 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6716'>RFC 6716</link></span> <note>RFC 6716: Definition of the Opus Audio Codec &lt;<link url='http://tools.ietf.org/html/rfc6716'>http://tools.ietf.org/html/rfc6716</link>&gt;.</note>" >
 <!ENTITY rfc6762 "<span class='ref'><link url='http://tools.ietf.org/html/rfc6762'>RFC 6762</link></span> <note>RFC 6762: Multicast DNS &lt;<link url='http://tools.ietf.org/html/rfc6762'>http://tools.ietf.org/html/rfc6762</link>&gt;.</note>" >
@@ -641,6 +642,7 @@ THE SOFTWARE.
 
 <!ENTITY rfc6122bis "<span class='ref'><link url='https://datatracker.ietf.org/doc/draft-ietf-xmpp-6122bis/'>rfc6122bis</link></span> <note>Extensible Messaging and Presence Protocol (XMPP): Address Format &lt;<link url='https://datatracker.ietf.org/doc/draft-ietf-xmpp-6122bis/'>https://datatracker.ietf.org/doc/draft-ietf-xmpp-6122bis/</link>&gt;. Work in progress.</note>" >
 <!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 bundle "<span class='ref'><link url='https://datatracker.ietf.org/doc/draft-ietf-mmusic-sdp-bundle-negotiation/'>draft-ietf-mmusic-sdp-bundle-negotiation</link></span> <note>Negotiating Media Multiplexing Using the Session Description Protocol (SDP) &lt;<link url='https://datatracker.ietf.org/doc/draft-ietf-mmusic-sdp-bundle-negotiation/'>https://datatracker.ietf.org/doc/draft-ietf-mmusic-sdp-bundle-negotiation/</link>&gt;. Work in progress.</note>" >
 <!ENTITY cusax "<span class='ref'><link url='https://datatracker.ietf.org/doc/draft-ivov-xmpp-cusax/'>CUSAX</link></span> <note>CUSAX: Combined Use of the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='https://datatracker.ietf.org/doc/draft-ivov-xmpp-cusax/'>https://datatracker.ietf.org/doc/draft-ivov-xmpp-cusax/</link>&gt;. Work in progress.</note>" >
 <!ENTITY dna-dns "<span class='ref'><link url='http://datatracker.ietf.org/doc/draft-miller-xmpp-dnssec-prooftype/'>draft-miller-xmpp-dnssec-prooftype</link></span> <note>Using DNS Security Extensions (DNSSEC) and DNS-based Authentication of Named Entities (DANE) as a Prooftype for XMPP Domain Name Associations &lt;<link url='http://datatracker.ietf.org/doc/draft-miller-xmpp-dnssec-prooftype/'>http://datatracker.ietf.org/doc/draft-miller-xmpp-dnssec-prooftype/</link>&gt;. Work in progress.</note>" >
 <!ENTITY dna-framework "<span class='ref'><link url='http://datatracker.ietf.org/doc/draft-ietf-xmpp-dna/'>DNA</link></span> <note>Domain Name Associations (DNA) in the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://datatracker.ietf.org/doc/draft-ietf-xmpp-dna/'>http://datatracker.ietf.org/doc/draft-ietf-xmpp-dna/</link>&gt;. Work in progress.</note>" >
@@ -648,7 +650,6 @@ THE SOFTWARE.
 <!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>" >
 <!ENTITY iax "<span class='ref'><link url='http://tools.ietf.org/html/draft-guy-iax'>IAX</link></span> <note>IAX: Inter-Asterisk eXchange Version 2 &lt;<link url='http://tools.ietf.org/html/draft-guy-iax'>http://tools.ietf.org/html/draft-ietf-guy-iax</link>&gt;. Work in progress.</note>" >
 <!ENTITY ice "<span class='ref'><link url='http://tools.ietf.org/html/rfc5245'>RFC 5245</link></span> <note>RFC 5245: Interactive Connectivity Establishment (ICE) &lt;<link url='http://tools.ietf.org/html/rfc5245'>http://tools.ietf.org/html/rfc5245</link>&gt;.</note>" >
-<!ENTITY ice-tcp "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp'>TCP Candidates with Interactive Connectivity Establishment (ICE)</link></span> <note>TCP Candidates with Interactive Connectivity Establishment (ICE) &lt;<link url='http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp'>http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp</link>&gt;. Work in progress.</note>" >
 <!ENTITY miletemplate "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-mile-template'>Guidelines for Defining Extensions to IODEF</link></span> <note>Guidelines for Defining Extensions to IODEF &lt;<link url='http://tools.ietf.org/html/draft-ietf-mile-template'>http://tools.ietf.org/html/draft-ietf-mile-template</link>&gt;. Work in progress.</note>" >
 <!ENTITY opusrtp "<span class='ref'><link url='http://tools.ietf.org/html/draft-spittka-payload-rtp-opus'>RTP Payload Format and File Storage Format for Opus Speech and Audio Codec</link></span> <note>RTP Payload Format and File Storage Format for Opus Speech and Audio Codec &lt;<link url='http://tools.ietf.org/html/draft-spittka-payload-rtp-opus'>http://tools.ietf.org/html/draft-spittka-payload-rtp-opus</link>&gt;. Work in progress.</note>" >
 <!ENTITY pidf "<span class='ref'><link url='http://tools.ietf.org/html/rfc3863'>Presence Information Data Format (PIDF) </link></span> <note>RFC 3863: Presence Information Data Format (PIDF) &lt;<link url='http://tools.ietf.org/html/rfc3863'>http://tools.ietf.org/html/rfc3863</link>&gt;.</note>" >
@@ -716,8 +717,8 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
   <author>
     <firstname>Peter</firstname>
     <surname>Saint-Andre</surname>
-    <email>stpeter@jabber.org</email>
-    <jid>stpeter@jabber.org</jid>
+    <email>peter@andyet.net</email>
+    <jid>stpeter@stpeter.im</jid>
     <uri>https://stpeter.im/</uri>
   </author>
 " >
@@ -962,6 +963,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
   <author>
     <firstname>Philipp</firstname>
     <surname>Hancke</surname>
+    <email>fippo@andyet.com</email>
     <jid>fippo@psyced.org</jid>
   </author>
 " >