diff --git a/xep-0373.xml b/xep-0373.xml
index 7d8f21d6..6291b971 100644
--- a/xep-0373.xml
+++ b/xep-0373.xml
@@ -55,6 +55,12 @@ Standards Foundation.</permissions>
     <email>look@my.amazin.horse</email>
     <jid>valodim@stratum0.org</jid>
   </author>
+  <revision>
+    <version>0.1.1</version>
+    <date>2016-06-04</date>
+    <initials>fs</initials>
+    <remark><p>Minior editorial fixes.</p></remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2016-05-10</date>
@@ -99,7 +105,7 @@ Standards Foundation.</permissions>
   <dl>
     <di><dt>OpenPGP element</dt><dd>An XMPP extension element: &openpgp; qualified by the 'urn:xmpp:openpgp:0' namespace</dd></di>
     <di><dt>OpenPGP content element</dt><dd>An element embedded via OpenPGP in a &openpgp; element. Either one of &signcrypt;, &sign; or &crypt;, qualified by the 'urn:xmpp:openpgp:0' namespace.</dd></di>
-    <di><dt>PEP</dt><dd>Personal Eventing Protocol (XEP-0163)</dd></di>
+    <di><dt>PEP</dt><dd>Personal Eventing Protocol (<cite>XEP-0163</cite>)</dd></di>
     <di><dt>Public key PEP node</dt><dd>A PEP node containing an entity's public OpenPGP key.</dd></di>
     <di><dt>Secret key PEP node</dt><dd>A PEP node containing an entity's encrypted secret OpenPGP key.</dd></di>
   </dl>
@@ -178,8 +184,8 @@ Standards Foundation.</permissions>
     <table caption='OpenPGP Content Element Properties'>
       <tr>
         <th>Content Element</th>
-        <th>'to' Attribute</th>
-        <th>'time' Attribute</th>
+        <th>'to' Element</th>
+        <th>'time' Element</th>
         <th>&lt;rpad/&gt; Element</th>
         <th>&lt;payload/&gt; Element</th>
       </tr>
@@ -645,7 +651,7 @@ Standards Foundation.</permissions>
     API may provide access to the embedded OpenPGP timestamp.</p>
 
     <p>The 'rpad' element of the OpenPGP content elements exists to
-    prevent length-base side channel attacks.</p>
+    prevent length-based side channel attacks.</p>
 
   </section2>
 
@@ -662,7 +668,7 @@ Standards Foundation.</permissions>
     encrypting of the element. The scope of the specification was
     deliberately limited to OpenPGP.</p>
 
-    <p>Features like signed presences, which is provided by XEP-0027,
+    <p>Features like signed presences, which is provided by <cite>XEP-0027</cite>,
     may be added later on as add-on XEP to this.</p>
 
   </section2>
@@ -683,13 +689,13 @@ Standards Foundation.</permissions>
   <section2 topic='OpenPGP User IDs' anchor='openpgp-user-ids'>
 
     <p>OpenPGP User IDs normally consist of a name - email address pair, e.g.,
-    "Juliet &lt;juliet@example.org&gt;" (&rfc4880; <link
-    url='http://tools.ietf.org/html/rfc4880#section-5.11'>§ 5.11</link>).
+    "Juliet &lt;juliet@example.org&gt;" (<link
+    url='http://tools.ietf.org/html/rfc4880#section-5.11'><cite>RFC 4880 § 5.11</cite></link>).
     For this XEP, we require User IDs of the format "xmpp:juliet@example.org".
     First, it is required to have at least one User ID indicating the use
     of this OpenPGP key. When doing certification of keys (key signing),
     the partner must know what User ID she actually certifies.
-    Second, this format uses the standardized URI from XEP-0147 to indicate
+    Second, this format uses the standardized URI from <cite>XEP-0147</cite> to indicate
     that this User ID corresponds to a key that is used for XMPP.
     Third, having the Real Name inside provides no additional security
     or guideline if this key should be certified. The XMPP address
@@ -755,7 +761,7 @@ Standards Foundation.</permissions>
 
 <section1 topic='Acknowledgements' anchor='acknowledgements'>
 
-  <p>Thanks to Emmanuel Gil Peyrot, Sergei Golovan, Marc Laporte Georg
+  <p>Thanks to Emmanuel Gil Peyrot, Sergei Golovan, Marc Laporte, Georg
   Lukas and Adithya Abraham Philip for their feedback.</p>
 
   <p>The first draft of this specification was worked out and written
diff --git a/xep-0374.xml b/xep-0374.xml
index 0cea0432..fdfcea95 100644
--- a/xep-0374.xml
+++ b/xep-0374.xml
@@ -13,7 +13,7 @@
 <xep>
 <header>
   <title>OpenPGP for XMPP Instant Messaging</title>
-  <abstract>Specifies a OpenPGP for XMPP (XEP-OX) profile for the Instant
+  <abstract>Specifies a OpenPGP for XMPP (XEP-0373) profile for the Instant
     Messaging (IM) use case.</abstract>
   <legal>
     <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2016 by the XMPP Standards Foundation (XSF).</copyright>
@@ -49,6 +49,12 @@ Standards Foundation.</permissions>
     <email>look@my.amazin.horse</email>
     <jid>valodim@stratum0.org</jid>
   </author>
+  <revision>
+    <version>0.1.1</version>
+    <date>2016-06-04</date>
+    <initials>fs</initials>
+    <remark><p>Minior editorial fixes.</p></remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2016-05-10</date>
@@ -124,12 +130,16 @@ Standards Foundation.</permissions>
     to store OpenPGP key information in the Domain Name
     System (DNS). This specification does not restrict the mechanism
     of key discovery and retrieval, but compliant clients MUST support
-    the public key announcement as described in &xep0373; §4.</p>
+    the public key announcement as described in <link
+    url='./xep-0373.html#announcing-discover-pubkey'><cite>XEP-0373
+    § 4</cite></link>.</p>
 
     <p>After the required public keys have been discovered, XMPP
     clients engage in an OpenPGP secured IM
     conversation by exchanging &openpgp; extension elements. They MUST
-    use the &signcrypt; OpenPGP content element specified in &xep0373; §3.1.</p>
+    use the &signcrypt; OpenPGP content element specified in <link
+    url='./xep-0373.html#exchange'><cite>XEP-0373 §
+    3.1</cite></link>.</p>
 
     <p>The child elements of the OpenPGP content element's &payload;
     can be seen as stanza extension elements which are encrypted and
@@ -164,7 +174,7 @@ Standards Foundation.</permissions>
 
       <section3 topic='OpenPGP Secret Key Synchronization' anchor='openpgp-secret-key-sync'>
 
-      <p>Clients MAY want to use the mechanism in &xep0374; §5 to
+      <p>Clients MAY want to use the mechanism in <cite>XEP-0373 § 5</cite> to
       synchronize their secret key(s) over multiple devices. Thus, they
       should query the user's PEP service for an eventually stored
       encrypted secret key.</p>
@@ -230,14 +240,16 @@ Standards Foundation.</permissions>
 <section1 topic='XML Schema' anchor='schema'>
 
   <p>This XEP does not define a Schema, since it exclusively uses elements from
-  &xep0373; and other XEPs.</p>
+  <cite>XEP-0373</cite> and other XEPs.</p>
 
 </section1>
 
 <section1 topic='Acknowledgements' anchor='acknowledgements'>
 
-  <p>Please refer to the Acknowledgements section of &xep0373;, since the two
-    XEPs where designed together.</p>
+  <p>Please refer to the <link
+  url='./xep-0373.html#acknowledgements'>Acknowledgements
+  section of <cite>XEP-0373</cite></link>, since the two XEPs where designed
+  together.</p>
 
 </section1>
 </xep>