diff --git a/xep.ent b/xep.ent
index daccc163..c99ab989 100644
--- a/xep.ent
+++ b/xep.ent
@@ -213,10 +213,14 @@
Common Alerting Protocol Common Alerting Protocol, v. 1.0 <http://www.oasis-open.org/committees/documents.php?wg_abbrev=emergency>." >
+
+
+Arcfour A Stream Cipher Encryption Algorithm 'Arcfour' <http://www.watersprings.org/pub/id/draft-kaukonen-cipher-arcfour-03.txt>." >
+draft-dawson-vcard-xml-dtd-03 draft-dawson-vcard-xml-dtd-03 <http://www.watersprings.org/pub/id/draft-dawson-vcard-xml-dtd-03.txt>. Work in progress." >
+
ANSI X9.52 ANSI X9.52: Triple Data Encryption Algorithm Modes of Operation (1998)." >
-Arcfour A Stream Cipher Encryption Algorithm 'Arcfour' <http://www.watersprings.org/pub/id/draft-kaukonen-cipher-arcfour-03.txt>." >
Blowfish Description of a New Variable-Length Key, 64-Bit Block Cipher (Blowfish) <http://www.schneier.com/paper-blowfish-fse.html>." >
IDEA The IDEA Block Cipher <http://perso.ens-lyon.fr/jean-luc.beuchat/IDEA/>." >
Data Encryption Standard Data Encryption Standard: Federal Information Processing Standards Publication 46-3 <http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf>." >
@@ -310,7 +314,7 @@
RFC 2451 RFC 2451: The ESP CBC-Mode Cipher Algorithms <http://tools.ietf.org/html/rfc2451>." >
RFC 2510 RFC 2510: Internet X.509 Public Key Infrastructure Certificate Management Protocols <http://tools.ietf.org/html/rfc2510>." >
RFC 2518 RFC 2518: HTTP Extensions for Distributed Authoring -- WEBDAV <http://tools.ietf.org/html/rfc2518>." >
-rfc2518bis RFC 2518: HTTP Extensions for Distributed Authoring -- WebDAV <http://www.ietf.org/internet-drafts/draft-ietf-webdav-rfc2518bis-17.txt>." >
+rfc2518bis RFC 2518: HTTP Extensions for Distributed Authoring -- WebDAV <http://tools.ietf.org/html/draft-ietf-webdav-rfc2518bis>." >
RFC 2606 RFC 2606: Reserved Top Level DNS Names <http://tools.ietf.org/html/rfc2606>." >
RFC 2616 RFC 2616: Hypertext Transport Protocol -- HTTP/1.1 <http://tools.ietf.org/html/rfc2616>." >
RFC 2617 RFC 2617: HTTP Authentication: Basic and Digest Access Authentication <http://tools.ietf.org/html/rfc2617>." >
@@ -414,24 +418,23 @@
-draft-dawson-vcard-xml-dtd-03 draft-dawson-vcard-xml-dtd-03 <http://www.watersprings.org/pub/id/draft-dawson-vcard-xml-dtd-03.txt>. Work in progress." >
DNS-Based Service Discovery DNS-Based Service Discovery <http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt>. Work in progress." >
-Geopriv Policy Geopriv Policy <http://www.ietf.org/internet-drafts/draft-ietf-geopriv-policy>. Work in progress." >
-IAX IAX: Inter-Asterisk eXchange Version 2 <http://www.ietf.org/internet-drafts/draft-ietf-guy-iax>. Work in progress." >
-Interactive Connectivity Establishment (ICE) Interactive Connectivity Establishment (ICE): A Methodology for Network Address Translator (NAT) Traversal for Offer/Answer Protocols <http://www.ietf.org/internet-drafts/draft-ietf-mmusic-ice-14.txt>. Work in progress." >
-TCP Candidates with Interactive Connectivity Establishment (ICE) TCP Candidates with Interactive Connectivity Establishment (ICE) <http://www.ietf.org/internet-drafts/draft-ietf-mmusic-ice-tcp>. Work in progress." >
+Geopriv Policy Geopriv Policy <http://tools.ietf.org/html/draft-ietf-geopriv-policy>. Work in progress." >
+IAX IAX: Inter-Asterisk eXchange Version 2 <http://tools.ietf.org/html/draft-ietf-guy-iax>. Work in progress." >
+Interactive Connectivity Establishment (ICE) Interactive Connectivity Establishment (ICE): A Methodology for Network Address Translator (NAT) Traversal for Offer/Answer Protocols <http://tools.ietf.org/html/draft-ietf-mmusic-ice>. Work in progress." >
+TCP Candidates with Interactive Connectivity Establishment (ICE) TCP Candidates with Interactive Connectivity Establishment (ICE) <http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp>. Work in progress." >
Multicast DNS Multicast DNS <http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt>. Work in progress." >
Presence Information Data Format (PIDF) RFC 3863: Presence Information Data Format (PIDF) <http://tools.ietf.org/html/rfc3863>." >
RTP Over DTLS Real-Time Transport Protocol (RTP) over Datagram Transport Layer Security (DTLS) <http://scm.sipfoundry.org/rep/ietf-drafts/ekr/draft-tschofenig-avt-rtp-dtls-00.txt>. Work in progress." >
RTP Over DTLS Real-Time Transport Protocol (RTP) over Datagram Transport Layer Security (DTLS) <http://tools.ietf.org/html/draft-fischl-mmusic-sdp-dtls>. Work in progress." >
-Sieve Extension: Notifications Sieve Extension: Notifications <http://www.ietf.org/internet-drafts/draft-ietf-sieve-notify>. Work in progress." >
-Sieve Notification Mechanism: xmpp Sieve Notification Mechanism: xmpp <http://www.ietf.org/internet-drafts/draft-ietf-sieve-notify-xmpp>. Work in progress." >
-Session Description and Capability Negotiation (SDPng) Session Description and Capability Negotiation (SDPng) <http://www.ietf.org/internet-drafts/draft-ietf-mmusic-sdpng>. Work in progress." >
-X.509 Authentication in SSH2 X.509 Authentication in SSH2 <http://www.ietf.org/internet-drafts/draft-ietf-secsh-x509>. Work in progress." >
-Improving TCP's Robustness to Blind In-Window Attacks Improving TCP's Robustness to Blind In-Window Attacks <http://www.ietf.org/internet-drafts/draft-ietf-ietf-tcpm-tcpsecure>. Work in progress." >
-TURN Obtaining Relay Addresses from Simple Traversal Underneath NAT (STUN) <http://www.ietf.org/internet-drafts/draft-ietf-behave-turn>. Work in progress." >
-U-NAPTR Domain-based Application Service Location Using URIs and the Dynamic Delegation Discovery Service <http://www.ietf.org/internet-drafts/draft-daigle-unaptr>. Work in progress." >
-ZRTP ZRTP: Media Path Key Agreement for Secure RTP <http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp>. Work in progress." >
+Sieve Extension: Notifications Sieve Extension: Notifications <http://tools.ietf.org/html/draft-ietf-sieve-notify>. Work in progress." >
+Sieve Notification Mechanism: xmpp Sieve Notification Mechanism: xmpp <http://tools.ietf.org/html/draft-ietf-sieve-notify-xmpp>. Work in progress." >
+Session Description and Capability Negotiation (SDPng) Session Description and Capability Negotiation (SDPng) <http://tools.ietf.org/html/draft-ietf-mmusic-sdpng>. Work in progress." >
+X.509 Authentication in SSH2 X.509 Authentication in SSH2 <http://tools.ietf.org/html/draft-ietf-secsh-x509>. Work in progress." >
+Improving TCP's Robustness to Blind In-Window Attacks Improving TCP's Robustness to Blind In-Window Attacks <http://tools.ietf.org/html/draft-ietf-ietf-tcpm-tcpsecure>. Work in progress." >
+TURN Obtaining Relay Addresses from Simple Traversal Underneath NAT (STUN) <http://tools.ietf.org/html/draft-ietf-behave-turn>. Work in progress." >
+U-NAPTR Domain-based Application Service Location Using URIs and the Dynamic Delegation Discovery Service <http://tools.ietf.org/html/draft-daigle-unaptr>. Work in progress." >
+ZRTP ZRTP: Media Path Key Agreement for Secure RTP <http://tools.ietf.org/html/draft-zimmermann-avt-zrtp>. Work in progress." >
@@ -443,8 +446,8 @@
-rfc3920bis rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Core <http://www.ietf.org/internet-drafts/draft-saintandre-rfc3920bis>. (work in progress)" >
-rfc3921bis rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence <http://www.ietf.org/internet-drafts/draft-saintandre-rfc3921bis>. (work in progress)" >
+rfc3920bis rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Core <http://tools.ietf.org/html/draft-saintandre-rfc3920bis>. (work in progress)" >
+rfc3921bis rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence <http://tools.ietf.org/html/draft-saintandre-rfc3921bis>. (work in progress)" >
XMPP Extensible Messaging and Presence Protocol (XMPP) <http://www.xmpp.org/>." >
XMPP Core RFC 3920: Extensible Messaging and Presence Protocol (XMPP): Core <http://tools.ietf.org/html/rfc3920>." >
@@ -452,8 +455,8 @@
XMPP CPIM RFC 3922: Mapping the Extensible Messaging and Presence Protocol (XMPP) to Common Presence and Instant Messaging (CPIM) <http://tools.ietf.org/html/rfc3922>." >
XMPP E2E RFC 3923: End-to-End Signing and Object Encryption for the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/rfc3923>." >
XMPP URI Scheme Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/rfc4622>." >
-draft-saintandre-xmpp-simple Basic Messaging and Presence Interoperability between the Extensible Messaging and Presence Protocol (XMPP) and Session Initiation Protocol (SIP) for Instant Messaging and Presence Leveraging Extensions (SIMPLE) <http://www.ietf.org/internet-drafts/draft-saintandre-xmpp-simple> (work in progress)." >
-XMPP URNs A Uniform Resource Name (URN) Namespace for Extensions to the Extensible Messaging and Presence Protocol (XMPP) <http://www.ietf.org/internet-drafts/draft-saintandre-xmpp-urn> (work in progress)." >
+draft-saintandre-xmpp-simple Basic Messaging and Presence Interoperability between the Extensible Messaging and Presence Protocol (XMPP) and Session Initiation Protocol (SIP) for Instant Messaging and Presence Leveraging Extensions (SIMPLE) <http://tools.ietf.org/html/draft-saintandre-xmpp-simple> (work in progress)." >
+XMPP URNs A Uniform Resource Name (URN) Namespace for Extensions to the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/draft-saintandre-xmpp-urn> (work in progress)." >