diff --git a/xep-0030.xml b/xep-0030.xml
index aaf45385..245599c1 100644
--- a/xep-0030.xml
+++ b/xep-0030.xml
@@ -13,6 +13,7 @@
     <status>Final</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
+    <interim/>
     <dependencies>
       <spec>XMPP Core</spec>
     </dependencies>
@@ -35,6 +36,12 @@
     &pgmillard;
     &reatmon;
     &stpeter;
+    <revision>
+      <version>2.4rc1</version>
+      <date>2014-06-20</date>
+      <initials>editor(mam)</initials>
+      <remark><p>Errata submitted to standards@ regarding subscriptions and returned items.</p></remark>
+    </revision>
     <revision>
       <version>2.4</version>
       <date>2008-06-06</date>
@@ -674,14 +681,14 @@
         <p>In response to a disco#info request, the server MUST return a &unavailable; error if one of the following is true:</p>
         <ol>
           <li>The target entity does not exist (no matter if the request specifies a node or not).</li>
-          <li>The requesting entity is not authorized to receive presence from the target entity (i.e., via a presence subscription of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network).</li>
+          <li>The requesting entity is not authorized to receive presence from the target entity (i.e., via the target having a presence subscription to the requesting entity of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network).</li>
         </ol>
       </li>
       <li>
         <p>In response to a disco#items request, the server MUST return an empty result set if:</p>
         <ol>
           <li>The target entity does not exist (no matter if the request specifies a node or not).</li>
-          <li>The request did not specify a node, the only items are available resources (as defined in <cite>RFC 3921</cite>), and the requesting entity is not authorized to receive presence from the target entity (i.e., via a presence subscription of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network). <note>However, the server MAY return items other than available resources (if any).</note></li>
+          <li>The request did not specify a node, the only items are available resources (as defined in <cite>RFC 3921</cite>), and the requesting entity is not authorized to receive presence from the target entity (i.e., via the target having a presence subscription to the requesting entity of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network). <note>However, the server MAY return items other than available resources (if any).</note></li>
         </ol>
       </li>
     </ol>