diff --git a/xep.ent b/xep.ent
index 474f9551..daccc163 100644
--- a/xep.ent
+++ b/xep.ent
@@ -416,21 +416,22 @@
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-08.txt>. Work in progress." >
-IAX IAX: Inter-Asterisk eXchange Version 2 <http://www.ietf.org/internet-drafts/draft-ietf-guy-iax-01.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-03.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." >
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." >
-Sieve Extension: Notifications Sieve Extension: Notifications <http://www.ietf.org/internet-drafts/draft-ietf-sieve-notify-03.txt>. Work in progress." >
-Sieve Notification Mechanism: xmpp Sieve Notification Mechanism: xmpp <http://www.ietf.org/internet-drafts/draft-ietf-sieve-notify-xmpp-01.txt>. 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-09.txt>. Work in progress." >
-X.509 Authentication in SSH2 X.509 Authentication in SSH2 <http://www.ietf.org/internet-drafts/draft-ietf-secsh-x509-03.txt>. 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-06.txt>. Work in progress." >
-TURN Obtaining Relay Addresses from Simple Traversal Underneath NAT (STUN) <http://www.ietf.org/internet-drafts/draft-ietf-behave-turn-02.txt>. 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-02.txt>. Work in progress." >
-ZRTP ZRTP: Media Path Key Agreement for Secure RTP <http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-03.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." >
@@ -442,8 +443,8 @@
-rfc3920bis rfc3921bis: proposed revisions to Extensible Messaging and Presence Protocol (XMPP): Core <http://www.ietf.org/internet-drafts/draft-saintandre-rfc3920bis-01.txt>. (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-01.txt>. (work in progress)" >
+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)" >
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>." >
@@ -451,8 +452,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-09.txt> (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-01.txt> (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://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)." >