diff --git a/xep.ent b/xep.ent
index ea97b880..c14d62f7 100644
--- a/xep.ent
+++ b/xep.ent
@@ -483,6 +483,7 @@ THE SOFTWARE.
 <!ENTITY rfc3288 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3288'>RFC 3288</link></span> <note>RFC 3288: Using the Simple Object Access Protocol (SOAP) in Blocks Extensible Exchange Protocol (BEEP) &lt;<link url='http://tools.ietf.org/html/rfc3288'>http://tools.ietf.org/html/rfc3288</link>&gt;.</note>" >
 <!ENTITY rfc3312 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3312'>RFC 3312</link></span> <note>RFC 3312: Integration of Resource Management and Session Initiation Protocol (SIP) &lt;<link url='http://tools.ietf.org/html/rfc3312'>http://tools.ietf.org/html/rfc3312</link>&gt;.</note>" >
 <!ENTITY rfc3330 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3330'>RFC 3330</link></span> <note>RFC 3330: Special-Use IPv4 Addresses &lt;<link url='http://tools.ietf.org/html/rfc3330'>http://tools.ietf.org/html/rfc3330</link>&gt;.</note>" >
+<!ENTITY rfc3339 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3339'>DATETIME</link></span> <note>RFC 3339: Date and Time on the Internet: Timestamps &lt;<link url='http://tools.ietf.org/html/rfc3339'>http://tools.ietf.org/html/rfc3339</link>&gt;.</note>" >
 <!ENTITY rfc3340 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3340'>RFC 3340</link></span> <note>RFC 3340: The Application Exchange Core (APEX) &lt;<link url='http://tools.ietf.org/html/rfc3340'>http://tools.ietf.org/html/rfc3340</link>&gt;.</note>" >
 <!ENTITY rfc3341 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3341'>RFC 3341</link></span> <note>RFC 3341: The Application Exchange (APEX) Access Service &lt;<link url='http://tools.ietf.org/html/rfc3341'>http://tools.ietf.org/html/rfc3341</link>&gt;.</note>" >
 <!ENTITY rfc3342 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3342'>RFC 3342</link></span> <note>RFC 3342: The Application Exchange (APEX) Option Party Pack, Part Deux! &lt;<link url='http://tools.ietf.org/html/rfc3342'>http://tools.ietf.org/html/rfc3342</link>&gt;.</note>" >
@@ -519,6 +520,7 @@ THE SOFTWARE.
 <!ENTITY rfc3921 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3921'>RFC 3921</link></span> <note>RFC 3921: Extensible Messaging and Presence Protocol (XMPP): Instant Messaging and Presence &lt;<link url='http://tools.ietf.org/html/rfc3921'>http://tools.ietf.org/html/rfc3921</link>&gt;.</note>" >
 <!ENTITY rfc3922 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3922'>RFC 3922</link></span> <note>RFC 3922: Mapping the Extensible Messaging and Presence Protocol (XMPP) to Common Presence and Instant Messaging (CPIM) &lt;<link url='http://tools.ietf.org/html/rfc3922'>http://tools.ietf.org/html/rfc3922</link>&gt;.</note>" >
 <!ENTITY rfc3923 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3923'>RFC 3923</link></span> <note>RFC 3923: End-to-End Signing and Object Encryption for the Extensible Messaging and Presence Protocol (XMPP) &lt;<link url='http://tools.ietf.org/html/rfc3923'>http://tools.ietf.org/html/rfc3923</link>&gt;.</note>" >
+<!ENTITY rfc3923bis "<span class='ref'><link url='http://tools.ietf.org/html/draft-miller-3923bis'>E2EEncrypt</link></span> <note>End-to-End Object Encryption for the Extensible Messaging and Presence Protocol (XMPP), Miller, M. and P. Saint-Andre, work in progress &lt;<link url='http://tools.ietf.org/html/draft-miller-3923bis'>http://tools.ietf.org/html/draft-miller-3923bis</link>&gt;.</note>" >
 <!ENTITY rfc3927 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3927'>RFC 3927</link></span> <note>RFC 3927: Dynamic Configuration of IPv4 Link-Local Addresses &lt;<link url='http://tools.ietf.org/html/rfc3927'>http://tools.ietf.org/html/rfc3927</link>&gt;.</note>" >
 <!ENTITY rfc3958 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3958'>RFC 3958</link></span> <note>RFC 3958: Domain-Based Application Service Location Using SRV RRs and the Dynamic Delegation Discovery Service (DDDS) &lt;<link url='http://tools.ietf.org/html/rfc3958'>http://tools.ietf.org/html/rfc3958</link>&gt;.</note>" >
 <!ENTITY rfc3959 "<span class='ref'><link url='http://tools.ietf.org/html/rfc3959'>RFC 3959</link></span> <note>RFC 3959: The Early Session Disposition Type for the Session Initiation Protocol (SIP) &lt;<link url='http://tools.ietf.org/html/rfc3959'>http://tools.ietf.org/html/rfc3959</link>&gt;.</note>" >
@@ -1171,3 +1173,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xep0287 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0287.html'>Spim Markers and Reports</link></span> <note>XEP-0287: Spim Markers and Reports &lt;<link url='http://xmpp.org/extensions/xep-0287.html'>http://xmpp.org/extensions/xep-0287.html</link>&gt;.</note>" >
 <!ENTITY xep0288 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0288.html'>Bidirectional Server-to-Server Connections</link></span> <note>XEP-0288: Bidirectional Server-to-Server Connections &lt;<link url='http://xmpp.org/extensions/xep-0288.html'>http://xmpp.org/extensions/xep-0288.html</link>&gt;.</note>" >
 <!ENTITY xep0289 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0289.html'>Federated MUC for Constrained Environments</link></span> <note>XEP-0289: Federated MUC for Constrained Environments &lt;<link url='http://xmpp.org/extensions/xep-0289.html'>http://xmpp.org/extensions/xep-0289.html</link>&gt;.</note>" >
+<!ENTITY xep0290 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0290.html'>Encapsulated Digital Signatures in XMPP</link></span> <note>XEP-0290: Encapsulated Digital Signatures in XMPP &lt;<link url='http://xmpp.org/extensions/xep-0290.html'>http://xmpp.org/extensions/xep-0290.html</link>&gt;.</note>" >
+<!ENTITY xep0291 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0291.html'>Service Delegation</link></span> <note>XEP-0291: Service Delegation &lt;<link url='http://xmpp.org/extensions/xep-0291.html'>http://xmpp.org/extensions/xep-0291.html</link>&gt;.</note>" >