diff --git a/xep-0172.xml b/xep-0172.xml
old mode 100644
new mode 100755
index 6912280b..08eca5d3
--- a/xep-0172.xml
+++ b/xep-0172.xml
@@ -111,7 +111,7 @@
   </revision>
 </header>
 <section1 topic='Introduction' anchor='intro'>
-  <p>A nickname is a global, memorable (but not necessarily unique) friendly or informal name chosen by the owner of a bare JID &LOCALBARE; for the purpose of associating a distinctive mapping between the person's unique JID and non-unique nickname. While nicknames have been a common feature of instant messaging systems for many years, they have not always featured prominently in Jabber/XMPP IM systems (e.g., nicknames are not specified in &rfc3921;). However, there are several reasons why nicknames are important:</p>
+  <p>A nickname is a global, memorable (but not necessarily unique) friendly or informal name chosen by the owner of a bare JID &LOCALBARE; for the purpose of associating a distinctive mapping between the person's unique JID and non-unique nickname. While nicknames have been a common feature of instant messaging systems for many years, they have not always featured prominently in Jabber/XMPP IM systems (e.g., nicknames were not specified in &rfc3921; or &rfc6121;). However, there are several reasons why nicknames are important:</p>
   <ul>
     <li>Users like them.</li>
     <li>They are easier to remember than JIDs.</li>
@@ -136,7 +136,7 @@
     </tr>
     <tr>
       <td>Handle</td>
-      <td>A private, unique, and memorable "petname" or "alias" assigned by a contact to a user; represented in the 'name' attribute of the item associated with that user's JID in the contact's roster. <note>In RFC 3921, the name here called a "handle" is described as an "alias"; rfc3921 will be modified to use the term "handle" instead.</note></td>
+      <td>A private, unique, and memorable "petname" or "alias" assigned by a contact to a user; represented in the 'name' attribute of the item associated with that user's JID in the contact's roster. <note>In RFC 3921, the name here called a "handle" was described as an "alias"; RFC 6121; was modified to use the term "handle" instead.</note></td>
     </tr>
   </table>
 </section1>
@@ -164,7 +164,7 @@
     <li>Waiting lists</li>
   </ul>
   <section2 topic='Presence Subscription Requests' anchor='subscription'>
-    <p>As defined in <cite>RFC 3921</cite>, a presence subscription request contains only the JID of the sender:</p>
+    <p>As defined in <cite>RFC 6121</cite>, a presence subscription request contains only the JID of the sender:</p>
     <example caption='A Basic Subscription Request'><![CDATA[
 <presence from='narrator@moby-dick.lit' to='starbuck@moby-dick.lit' type='subscribe'/>
     ]]></example>