diff --git a/xep.ent b/xep.ent
index baf9e6bf..bf030768 100644
--- a/xep.ent
+++ b/xep.ent
@@ -541,14 +541,14 @@ THE SOFTWARE.
 <!-- Internet-Drafts -->
 
 <!ENTITY atomsub "<span class='ref'><link url='http://www.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://www.xmpp.org/internet-drafts/draft-saintandre-atompub-notify-07.html'>http://www.xmpp.org/internet-drafts/draft-saintandre-atompub-notify-07.html</link>&gt;. Work in progress.</note>" >
-<!ENTITY dnssd "<span class='ref'><link url='http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt'>DNS-Based Service Discovery</link></span> <note>DNS-Based Service Discovery &lt;<link url='http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt'>http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt</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 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/draft-ietf-mmusic-ice'>Interactive Connectivity Establishment (ICE)</link></span> <note>Interactive Connectivity Establishment (ICE): A Methodology for Network Address Translator (NAT) Traversal for Offer/Answer Protocols &lt;<link url='http://tools.ietf.org/html/draft-ietf-mmusic-ice'>http://tools.ietf.org/html/draft-ietf-mmusic-ice</link>&gt;. Work in progress.</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 kittenspn "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-kitten-gssapi-domain-based-names'>draft-ietf-kitten-gssapi-domain-based-names</link></span> <note>GSS-API Internationalization and Domain-Based Service Names and Name Type &lt;<link url='http://tools.ietf.org/html/draft-ietf-kitten-gssapi-domain-based-names'>http://tools.ietf.org/html/draft-ietf-kitten-gssapi-domain-based-names</link>&gt;. Work in progress.</note>" >
 <!ENTITY kittenspnkrb5 "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-kitten-krb5-gssapi-domain-based-names'>draft-ietf-kitten-krb5-gssapi-domain-based-names</link></span> <note>GSS-API Domain-Based Service Names Mapping for the Kerberos V GSS Mechanism &lt;<link url='http://tools.ietf.org/html/draft-ietf-kitten-krb5-gssapi-domain-based-names'>http://tools.ietf.org/html/draft-ietf-kitten-krb5-gssapi-domain-based-names</link>&gt;. Work in progress.</note>" >
-<!ENTITY mdns "<span class='ref'><link url='http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt'>Multicast DNS</link></span> <note>Multicast DNS &lt;<link url='http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt'>http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt</link>&gt;. Work in progress.</note>" >
+<!ENTITY mdns "<span class='ref'><link url='http://tools.ietf.org/html/draft-cheshire-dnsext-multicastdns'>Multicast DNS</link></span> <note>Multicast DNS &lt;<link url='http://tools.ietf.org/html/draft-cheshire-dnsext-multicastdns'>http://tools.ietf.org/html/draft-cheshire-dnsext-multicastdns</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>" >
 <!ENTITY rfc3489bis "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-behave-rfc3489bis'>draft-ietf-behave-rfc3489bis</link></span> <note>Session Traversal Utilities for NAT (STUN) &lt;<link url='http://tools.ietf.org/html/draft-ietf-behave-rfc3489bis'>http://tools.ietf.org/html/draft-ietf-behave-rfc3489bis</link>&gt;.</note>" >
 <!ENTITY rtpspeex "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-avt-rtp-speex'>RTP Payload Format for the Speex Codec</link></span> <note>RTP Payload Format for the Speex Codec &lt;<link url='http://tools.ietf.org/html/draft-ietf-avt-rtp-speex'>http://tools.ietf.org/html/draft-ietf-avt-rtp-speex</link>&gt;. Work in progress.</note>" >