diff --git a/xep-0030.xml b/xep-0030.xml
index c15245f2..32378677 100644
--- a/xep-0030.xml
+++ b/xep-0030.xml
@@ -39,169 +39,169 @@
       <version>2.3</version>
       <date>2007-02-15</date>
       <initials>psa</initials>
-      <remark>Added implementation note regarding Entity Capabilities.</remark>
+      <remark><p>Added implementation note regarding Entity Capabilities.</p></remark>
     </revision>
     <revision>
       <version>2.2</version>
       <date>2006-01-24</date>
       <initials>psa</initials>
-      <remark>Further specified and clarified security considerations relating to server handling of requests sent to bare JIDs.</remark>
+      <remark><p>Further specified and clarified security considerations relating to server handling of requests sent to bare JIDs.</p></remark>
     </revision>
     <revision>
       <version>2.1</version>
       <date>2005-03-03</date>
       <initials>psa</initials>
-      <remark>Added paragraph to implementation notes about server handling of requests sent to bare JIDs.</remark>
+      <remark><p>Added paragraph to implementation notes about server handling of requests sent to bare JIDs.</p></remark>
     </revision>
     <revision>
       <version>2.0</version>
       <date>2004-07-20</date>
       <initials>psa</initials>
-      <remark>Per a vote of the Jabber Council, advanced status to Final.</remark>
+      <remark><p>Per a vote of the Jabber Council, advanced status to Final.</p></remark>
     </revision>
     <revision>
       <version>1.10</version>
       <date>2004-06-29</date>
       <initials>psa/jjh</initials>
-      <remark>Defined security considerations; changed extended presence example to use a fictitious protocol; further specified publish feature; defined registry submissions.</remark>
+      <remark><p>Defined security considerations; changed extended presence example to use a fictitious protocol; further specified publish feature; defined registry submissions.</p></remark>
     </revision>
     <revision>
       <version>1.9</version>
       <date>2004-05-27</date>
       <initials>psa</initials>
-      <remark>Clarified error conditions.</remark>
+      <remark><p>Clarified error conditions.</p></remark>
     </revision>
     <revision>
       <version>1.8</version>
       <date>2004-05-21</date>
       <initials>psa</initials>
-      <remark>Moved remaining feature negotiation text to XEP-0020.</remark>
+      <remark><p>Moved remaining feature negotiation text to XEP-0020.</p></remark>
     </revision>
     <revision>
       <version>1.7</version>
       <date>2004-05-13</date>
       <initials>psa</initials>
-      <remark>Added implementation note regarding flexibility of feature and item results; final editorial cleanup.</remark>
+      <remark><p>Added implementation note regarding flexibility of feature and item results; final editorial cleanup.</p></remark>
     </revision>
     <revision>
       <version>1.6</version>
       <date>2004-05-11</date>
       <initials>psa</initials>
-      <remark>Corrected examples of publishing available items; further clarified nature of node hierarchies.</remark>
+      <remark><p>Corrected examples of publishing available items; further clarified nature of node hierarchies.</p></remark>
     </revision>
     <revision>
       <version>1.5</version>
       <date>2004-05-10</date>
       <initials>psa</initials>
-      <remark>Added clarifying note about node hierarchies.</remark>
+      <remark><p>Added clarifying note about node hierarchies.</p></remark>
     </revision>
     <revision>
       <version>1.4</version>
       <date>2004-05-07</date>
       <initials>psa</initials>
-      <remark>Clarified usage of "directory"; added section defining the relationship between an entity and its associated items.</remark>
+      <remark><p>Clarified usage of "directory"; added section defining the relationship between an entity and its associated items.</p></remark>
     </revision>
     <revision>
       <version>1.3</version>
       <date>2004-04-23</date>
       <initials>psa</initials>
-      <remark>Further clarified item-publication protocol; moved some feature negotiation text to XEP-0020; added information about registry of well-known service discovery nodes; added implementation notes regarding tree-walking and large result sets; incorporated additional Call for Experience suggestions.</remark>
+      <remark><p>Further clarified item-publication protocol; moved some feature negotiation text to XEP-0020; added information about registry of well-known service discovery nodes; added implementation notes regarding tree-walking and large result sets; incorporated additional Call for Experience suggestions.</p></remark>
     </revision>
     <revision>
       <version>1.2</version>
       <date>2004-04-20</date>
       <initials>psa</initials>
-      <remark>Editorial cleanup; incorporated some Call for Experience suggestions.</remark>
+      <remark><p>Editorial cleanup; incorporated some Call for Experience suggestions.</p></remark>
     </revision>
     <revision>
       <version>1.1</version>
       <date>2004-03-15</date>
       <initials>psa</initials>
-      <remark>Described requirements, syntax, and use cases in a more formal manner; corrected several errors in the examples and schemas; defined XMPP Registrar procedures; added a number of references; specified XMPP error handling.</remark>
+      <remark><p>Described requirements, syntax, and use cases in a more formal manner; corrected several errors in the examples and schemas; defined XMPP Registrar procedures; added a number of references; specified XMPP error handling.</p></remark>
     </revision>
     <revision>
       <version>1.0</version>
       <date>2003-04-21</date>
       <initials>psa</initials>
-      <remark>Per a vote of the Jabber Council, advanced status to Draft; also added XML schemas.</remark>
+      <remark><p>Per a vote of the Jabber Council, advanced status to Draft; also added XML schemas.</p></remark>
     </revision>
     <revision>
       <version>0.13</version>
       <date>2003-02-25</date>
       <initials>pgm</initials>
-      <remark>Added remarks about empty node attributes; described semantics regarding multiple identity elements.</remark>
+      <remark><p>Added remarks about empty node attributes; described semantics regarding multiple identity elements.</p></remark>
     </revision>
     <revision>
       <version>0.12</version>
       <date>2003-02-06</date>
       <initials>pgm</initials>
-      <remark>Added support for IQ-set; added example for disco#info to a specific node.</remark>
+      <remark><p>Added support for IQ-set; added example for disco#info to a specific node.</p></remark>
     </revision>
     <revision>
       <version>0.11</version>
       <date>2002-12-17</date>
       <initials>psa</initials>
-      <remark>Added support for the 'node' attribute per discussion on the Standards list in order to support items that are not JID-addressable.</remark>
+      <remark><p>Added support for the 'node' attribute per discussion on the Standards list in order to support items that are not JID-addressable.</p></remark>
     </revision>
     <revision>
       <version>0.10</version>
       <date>2002-11-21</date>
       <initials>psa</initials>
-      <remark>Changed &lt;feature type='foo'/&gt; to &lt;feature var='foo'/&gt; to track changes in feature negotiation (XEP-0020); added initial registry parameters.</remark>
+      <remark><p>Changed &lt;feature type='foo'/&gt; to &lt;feature var='foo'/&gt; to track changes in feature negotiation (XEP-0020); added initial registry parameters.</p></remark>
     </revision>
     <revision>
       <version>0.9</version>
       <date>2002-11-07</date>
       <initials>psa</initials>
-      <remark>Added support for empty result sets in disco#item.</remark>
+      <remark><p>Added support for empty result sets in disco#item.</p></remark>
     </revision>
     <revision>
       <version>0.8</version>
       <date>2002-11-01</date>
       <initials>psa</initials>
-      <remark>Removed the max, start, and total attributes for item queries (this will be handled by a generic paging protocol); added "http://jabber.org/protocol/feature-neg" namespace as a feature to signal negotiability regarding one or more features.</remark>
+      <remark><p>Removed the max, start, and total attributes for item queries (this will be handled by a generic paging protocol); added "http://jabber.org/protocol/feature-neg" namespace as a feature to signal negotiability regarding one or more features.</p></remark>
     </revision>
     <revision>
       <version>0.7</version>
       <date>2002-10-28</date>
       <initials>psa</initials>
-      <remark>Cleaned up the feature text and examples.</remark>
+      <remark><p>Cleaned up the feature text and examples.</p></remark>
     </revision>
     <revision>
       <version>0.6</version>
       <date>2002-10-27</date>
       <initials>psa</initials>
-      <remark>Added the 'category' attribute to the &lt;feature/&gt; element; added security, IANA, and XMPP Registrar considerations; added a number of examples.</remark>
+      <remark><p>Added the 'category' attribute to the &lt;feature/&gt; element; added security, IANA, and XMPP Registrar considerations; added a number of examples.</p></remark>
     </revision>
     <revision>
       <version>0.5</version>
       <date>2002-10-15</date>
       <initials>psa</initials>
-      <remark>Total overhaul and simplification.</remark>
+      <remark><p>Total overhaul and simplification.</p></remark>
     </revision>
     <revision>
       <version>0.4</version>
       <date>2002-07-16</date>
       <initials>psa</initials>
-      <remark>Major additions and fixes, many more examples.</remark>
+      <remark><p>Major additions and fixes, many more examples.</p></remark>
     </revision>
     <revision>
       <version>0.3</version>
       <date>2002-05-30</date>
       <initials>psa</initials>
-      <remark>Re-organized around use cases, made some minor fixes.</remark>
+      <remark><p>Re-organized around use cases, made some minor fixes.</p></remark>
     </revision>
     <revision>
       <version>0.2</version>
       <date>2002-05-05</date>
       <initials>psa</initials>
-      <remark>Incorporated comments from co-authors and added notes.</remark>
+      <remark><p>Incorporated comments from co-authors and added notes.</p></remark>
     </revision>
     <revision>
       <version>0.1</version>
       <date>2002-05-03</date>
       <initials>psa</initials>
-      <remark>Initial draft.</remark>
+      <remark><p>Initial draft.</p></remark>
     </revision>
   </header>