diff --git a/xep-0167.xml b/xep-0167.xml
index 9f5efbba..6ddbdc8f 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -188,7 +188,7 @@
     </description>
   ]]></example>
   <p>The &lt;description/&gt; element is intended to be a child of a &JINGLE; element as specified in <cite>XEP-0166</cite>.</p>
-  <p>Each &lt;payload-type/&gt; element MAY contain one or more child elements that specify particular parameters related to the payload. For example, as described in <cite>draft-ietf-avt-rtp-speex</cite> <note>This Internet-Draft has expired; see &lt;<link url='http://www.watersprings.org/pub/id/draft-ietf-avt-rtp-speex-00.txt'>http://www.watersprings.org/pub/id/draft-ietf-avt-rtp-speex-00.txt</link>&gt; for an archived version.</note>, the "cng", "ebw", "mode", "sr", "ptime", and "vbr" parameters may be specified in relation to usage of the Speex <note>See &lt;<link url='http://www.speex.org/'>http://www.speex.org/</link>&gt;.</note> codec. Where such parameters are encoded via the "fmtp" SDP attribute, they shall be represented in Jingle via the following format:</p>
+  <p>Each &lt;payload-type/&gt; element MAY contain one or more child elements that specify particular parameters related to the payload. For example, as described in &rtpspeex;, the "cng", "mode", and "vbr" parameters may be specified in relation to usage of the Speex <note>See &lt;<link url='http://www.speex.org/'>http://www.speex.org/</link>&gt;.</note> codec. Where such parameters are encoded via the "fmtp" SDP attribute, they shall be represented in Jingle via the following format:</p>
   <code><![CDATA[
 <parameter name='foo' value='bar'/>
   ]]></code>
diff --git a/xep.ent b/xep.ent
index 8ec43d16..dc4a0986 100644
--- a/xep.ent
+++ b/xep.ent
@@ -481,6 +481,7 @@
 <!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 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-06</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>" >
 <!ENTITY rtpdtls "<span class='ref'><link url='http://scm.sipfoundry.org/rep/ietf-drafts/ekr/draft-tschofenig-avt-rtp-dtls-00.txt'>RTP Over DTLS</link></span> <note>Real-Time Transport Protocol (RTP) over Datagram Transport Layer Security (DTLS) &lt;<link url='http://scm.sipfoundry.org/rep/ietf-drafts/ekr/draft-tschofenig-avt-rtp-dtls-00.txt'>http://scm.sipfoundry.org/rep/ietf-drafts/ekr/draft-tschofenig-avt-rtp-dtls-00.txt</link>&gt;. Work in progress.</note>" >
 <!ENTITY rtptheora "<span class='ref'><link url='http://tools.ietf.org/html/draft-barbato-avt-rtp-theora'>RTP Payload Format for Theora Encoded Video</link></span> <note>RTP Payload Format for Theora Encoded Video &lt;<link url='http://tools.ietf.org/html/draft-barbato-avt-rtp-theora'>http://tools.ietf.org/html/draft-barbato-avt-rtp-theora</link>&gt;. Work in progress.</note>" >
 <!ENTITY sdpdtls "<span class='ref'><link url='http://tools.ietf.org/html/draft-fischl-mmusic-sdp-dtls'>RTP Over DTLS</link></span> <note>Real-Time Transport Protocol (RTP) over Datagram Transport Layer Security (DTLS) &lt;<link url='http://tools.ietf.org/html/draft-fischl-mmusic-sdp-dtls'>http://tools.ietf.org/html/draft-fischl-mmusic-sdp-dtls</link>&gt;. Work in progress.</note>" >