diff --git a/xep.ent b/xep.ent
index 9a6ae84c..27814b05 100644
--- a/xep.ent
+++ b/xep.ent
@@ -1,14 +1,14 @@
-
@@ -123,7 +123,7 @@
-This XMPP Extension Protocol is copyright 1999 - 2007 by the XMPP Standards Foundation (XSF) and is in full conformance with the XSF's Intellectual Property Rights Policy <http://www.xmpp.org/extensions/ipr-policy.shtml>. This material may be distributed only subject to the terms and conditions set forth in the Creative Commons Attribution License (<http://creativecommons.org/licenses/by/2.5/>)." >
+This XMPP Extension Protocol is copyright 1999 - 2007 by the XMPP Standards Foundation (XSF) and is in full conformance with the XSF's Intellectual Property Rights Policy <http://www.xmpp.org/extensions/ipr-policy.shtml>. This material may be distributed only subject to the terms and conditions set forth in the Creative Commons Attribution License (<http://creativecommons.org/licenses/by/2.5/>)." >
@@ -396,8 +396,8 @@
RFC 4347 RFC 4347: Datagram Transport Layer Security <http://tools.ietf.org/html/rfc4347>." >
RFC 4395 RFC 4395: Guidelines and Registration Procedures for New URI Schemes <http://tools.ietf.org/html/rfc4395>." >
RFC 4422 RFC 4422: Simple Authentication and Security Layer (SASL) <http://tools.ietf.org/html/rfc4422>." >
-RFC 4480 RFC 4480: RPID: Rich Presence Extensions to the Presence Information Data Format (PIDF) <http://www.rfc-editor.org/rfc/rfc4480.txt>." >
-RFC 4481 RFC 4481: Timed Presence Extensions to the Presence Information Data Format (PIDF) to Indicate Status Information for Past and Future Time Intervals <http://www.rfc-editor.org/rfc/rfc4481.txt>." >
+RFC 4480 RFC 4480: RPID: Rich Presence Extensions to the Presence Information Data Format (PIDF) <http://tools.ietf.org/html/rfc4480>." >
+RFC 4481 RFC 4481: Timed Presence Extensions to the Presence Information Data Format (PIDF) to Indicate Status Information for Past and Future Time Intervals <http://tools.ietf.org/html/rfc4481>." >
RFC 4505 RFC 4505: The SASL ANONYMOUS Mechanism <http://tools.ietf.org/html/rfc4505>." >
RFC 4566 RFC 4566: SDP: Session Description Protocol <http://tools.ietf.org/html/rfc4566>." >
RFC 4622 RFC 4622: Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/rfc4622>." >
@@ -425,7 +425,7 @@
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: Extensions to RTP for Diffie-Hellman Key Agreement for SRTP <http://www.ietf.org/internet-drafts/draft-zimmermann-avt-zrtp-01.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." >