diff --git a/boilerplate/dap/status-WD.include b/boilerplate/dap/status-WD.include
index 4f21f91..55a210f 100755
--- a/boilerplate/dap/status-WD.include
+++ b/boilerplate/dap/status-WD.include
@@ -20,17 +20,11 @@
 	This document is intended to become a W3C Recommendation.
 </p>
 
-<p>
+<p exclude-if="Text Macro: JOINTWEBAPPS">
 	If you wish to make comments regarding this document, please send them to
 	<a href="mailto:public-device-apis@w3.org?Subject=%5B[SHORTNAME]%5D%20PUT%20SUBJECT%20HERE">public-device-apis@w3.org</a>
 	(<a href="mailto:public-device-apis-request@w3.org?subject=subscribe">subscribe</a>,
-	<a href="https://lists.w3.org/Archives/Public/public-device-apis/">archives</a>)
-  <span include-if="Text Macro: JOINTWEBAPPS">
-    and <a href="mailto:public-webapps@w3.org?Subject=%5Borientation-event%5D%20PUT%20SUBJECT%20HERE">public-webapps@w3.org</a> 
-    (<a href="mailto:public-webapps-request@w3.org?subject=subscribe">subscribe</a>, 
-    <a href="https://lists.w3.org/Archives/Public/public-webapps/">archives</a>)
-  </span>
-	.
+	<a href="https://lists.w3.org/Archives/Public/public-device-apis/">archives</a>).
 	When sending e-mail,
 	please put the text “[SHORTNAME]” in the subject,
 	preferably like this:
@@ -38,6 +32,10 @@
 	All comments are welcome.
 </p>
 
+<p include-if="Text Macro: JOINTWEBAPPS">
+  If you wish to make comments regarding this document, please <a href="[REPOSITORYURL]/issues/new">file an issue on the specification repository</a>.
+</p>
+
 <p>
   Publication as a Working Draft does not imply endorsement by
     <abbr title="World Wide Web Consortium">W3C</abbr> and its Members. This is a draft document and may be updated, replaced or
@@ -66,6 +64,16 @@
 	with <a href="https://www.w3.org/policies/patent-policy/#sec-Disclosure">section 6 of the W3C Patent Policy</a>. 
 </p>
 
+<p include-if="Text Macro: JOINTWEBAPPS">
+  For general working group announcements, administrivia, and non-technical matters
+  email either <a href="mailto:public-device-apis@w3.org">public-device-apis@w3.org</a>
+	(<a href="mailto:public-device-apis-request@w3.org?subject=subscribe">subscribe</a>,
+	<a href="https://lists.w3.org/Archives/Public/public-device-apis/">archives</a>) 
+  or <a href="mailto:public-webapps@w3.org">public-webapps@w3.org</a>
+	(<a href="mailto:public-webapps-request@w3.org?subject=subscribe">subscribe</a>,
+	<a href="https://lists.w3.org/Archives/Public/public-webapps/">archives</a>).
+</p>
+
 <p>
   This document is governed by the <a id="w3c_process_revision" href="https://www.w3.org/policies/process/20231103/">03 November 2023 W3C Process Document</a>.
 </p>