diff --git a/xep-0369.xml b/xep-0369.xml
index 15fe92ec..9e64b3d9 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -46,6 +46,7 @@
      Fix Disco features to not use second namespace;
      Correct encoding of jid-multi;
      MAM intro clarification;
+     Always add to roster, with direction of roster controlled by share preference;
     </p></remark>
   </revision>
   <revision>
@@ -1009,11 +1010,17 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     </section3>
     <section3 topic="Roster Management" anchor="usecase-roster-management">
       <p>
-        As part of the channel joining process, the user's server MAY add the MIX channel to the user's roster using standard XMPP to update the roster.  This is done to share the user's presence status with the channel and so the MIX channel will get presence information from the user.  This roster entry will lead to the user's server correctly sending user's presence from all clients to the MIX channel. The roster subscription is configured with one way presence, as presence is sent to the MIX channel but no presence information is sent about the MIX channel to the user. The user's server MUST remove this roster entry after the user leaves the channel.
+        As part of the channel joining process, the user's server MUST add the MIX channel to the user's roster.  This is done to share the user's presence status with the channel and channel participants subscribing to presence, when the user wishes this presence to be shared.  These roster entries also enables the user's client to quickly determine which channels the user has joined.
+        This roster entry will lead to the user's server correctly sending user's presence from all the user's MIX clients to the MIX channel.  Where the user wishes to share presence, the roster subscription is configured with one way presence, as presence is sent to the MIX channel but no presence information is sent about the MIX channel to the user. 
       </p>
       <p>
-           If the user does not wish to publish presence information to the channel, the user will not add the roster entry.  A channel MAY require presence to be provided by all channel participants, which is controlled by the 'Participants Must Provide Presence' option.   The channel MAY check that channel participants have done this and MAY remove participants that do not do this.
+        If the user does not wish to publish presence information to the channel, the user's server will  add the roster entry with mode subscription=none.  The roster entry will be present to record that the user has joined the channel, but it will not send presence information to the channel.    The user's server MUST do this when the user has chosen Presence preference of 'Not Share' as described below.   If the user changes the value of the preference, the server MUST modify subscription mode to reflect this.
+
       </p>
+      <p>
+        The user's server MUST remove this roster entry when the user leaves the channel.
+      </p>
+      
       <p>
        A channel MAY publish an Avatar following &xep0084;.  A client MAY make use of this information to associate an Avatar with the roster entry for a channel.
       </p>