diff --git a/xep-0174.xml b/xep-0174.xml
index dd4416a2..4641a23a 100644
--- a/xep-0174.xml
+++ b/xep-0174.xml
@@ -698,7 +698,7 @@ _presence._tcp.local. IN NULL raw-binary-data-here
 </section1>
 
 <section1 topic='Acknowledgements' anchor='ack'>
-  <p>Thanks to Emanuele Aina, Jens Alfke, Marco Barisione, Justin Karneges, Marc Krochmal, Eric St. Onge, and Sjoerd Simons for their input.</p>
+  <p>Thanks to Emanuele Aina, Jens Alfke, Marco Barisione, Justin Karneges, Marc Krochmal, Eric St. Onge, and Sjoerd Simons for their input. Some of the explanatory concepts were loosely borrowed from &sipbonjour;.</p>
 </section1>
 
 </xep>
diff --git a/xep.ent b/xep.ent
index 4798bb04..56734599 100644
--- a/xep.ent
+++ b/xep.ent
@@ -124,10 +124,12 @@
 
 <!-- shortcuts for address types -->
 
-<!ENTITY BAREJID "&lt;node@domain.tld&gt;">
-<!ENTITY FULLJID "&lt;node@domain.tld/resource&gt;">
-<!ENTITY DOMAIN "&lt;domain.tld&gt;">
-<!ENTITY DOMAINRES "&lt;domain.tld/resource&gt;">
+<!ENTITY BAREJID "(&lt;local@node@domain.tld&gt; or &lt;domain.tld&gt;)">
+<!ENTITY FULLJID "(&lt;local@node@domain.tld/resource&gt; or &lt;domain.tld/resource&gt;)">
+<!ENTITY LOCAL "(&lt;local@domain.tld&gt;)">
+<!ENTITY LOCALRES "(&lt;local@domain.tld/resource&gt;)">
+<!ENTITY DOMAIN "(&lt;domain.tld&gt;)">
+<!ENTITY DOMAINRES "(&lt;domain.tld/resource&gt;)">
 
 <!-- shortcuts for error conditions -->
 
@@ -512,6 +514,7 @@
 <!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>" >
 <!ENTITY sievenotify "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-sieve-notify'>Sieve Extension: Notifications</link></span> <note>Sieve Extension: Notifications &lt;<link url='http://tools.ietf.org/html/draft-ietf-sieve-notify'>http://tools.ietf.org/html/draft-ietf-sieve-notify</link>&gt;. Work in progress.</note>" >
 <!ENTITY sievenotifyxmpp "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-sieve-notify-xmpp'>Sieve Notification Mechanism: xmpp</link></span> <note>Sieve Notification Mechanism: xmpp &lt;<link url='http://tools.ietf.org/html/draft-ietf-sieve-notify-xmpp'>http://tools.ietf.org/html/draft-ietf-sieve-notify-xmpp</link>&gt;. Work in progress.</note>" >
+<!ENTITY sipbonjour "<span class='ref'><link url='http://tools.ietf.org/html/draft-lee-sip-dns-sd-uri'>SIP URI Service Discovery using DNS-SD</link></span> <note>SIP URI Service Discovery using DNS-SD &lt;<link url='http://tools.ietf.org/html/draft-lee-sip-dns-sd-uri'>http://tools.ietf.org/html/draft-lee-sip-dns-sd-uri</link>&gt;. Work in progress.</note>" >
 <!ENTITY sdpng "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-mmusic-sdpng'>Session Description and Capability Negotiation (SDPng)</link></span> <note>Session Description and Capability Negotiation (SDPng) &lt;<link url='http://tools.ietf.org/html/draft-ietf-mmusic-sdpng'>http://tools.ietf.org/html/draft-ietf-mmusic-sdpng</link>&gt;. Work in progress.</note>" >
 <!ENTITY sshx509 "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-secsh-x509'>X.509 Authentication in SSH2</link></span> <note>X.509 Authentication in SSH2 &lt;<link url='http://tools.ietf.org/html/draft-ietf-secsh-x509'>http://tools.ietf.org/html/draft-ietf-secsh-x509</link>&gt;. Work in progress.</note>" >
 <!ENTITY tcprobust "<span class='ref'><link url='http://tools.ietf.org/html/draft-ietf-ietf-tcpm-tcpsecure'>Improving TCP's Robustness to Blind In-Window Attacks</link></span> <note>Improving TCP's Robustness to Blind In-Window Attacks &lt;<link url='http://tools.ietf.org/html/draft-ietf-ietf-tcpm-tcpsecure'>http://tools.ietf.org/html/draft-ietf-ietf-tcpm-tcpsecure</link>&gt;. Work in progress.</note>" >