diff --git a/relative-json-pointer.xml b/relative-json-pointer.xml
index 0521fac2..3bc5337a 100644
--- a/relative-json-pointer.xml
+++ b/relative-json-pointer.xml
@@ -12,7 +12,7 @@
 <?rfc rfcedstyle="yes"?>
 <?rfc comments="yes"?>
 <?rfc inline="yes" ?>
-<rfc category="info" docName="draft-bhutton-relative-json-pointer-00" ipr="trust200902" submissionType="IETF">
+<rfc category="info" docName="draft-handrews-relative-json-pointer-03" ipr="trust200902" submissionType="IETF">
     <front>
         <title abbrev="Relative JSON Pointers">Relative JSON Pointers</title>
 
@@ -92,26 +92,19 @@
                 length or start with a '/' (%x2F).  Similarly, a JSON Pointer will
                 never be ambiguous with the '#'.
             </t>
-            <figure align="center">
-                <preamble>
-                    The ABNF syntax of a Relative JSON Pointer is:
-                </preamble>
-                <artwork>
-<![CDATA[
-   relative-json-pointer =  non-negative-integer [index-manipulation] <json-pointer>
-   relative-json-pointer =/ non-negative-integer "#"
-   index-manipulation    =  ("+" / "-") non-negative-integer
-   non-negative-integer      =  %x30 / %x31-39 *( %x30-39 )
-           ; "0", or digits without a leading "0"
-]]>
-                </artwork>
-                <postamble>
-                    where &lt;json-pointer&gt; follows the production defined in
-                    <xref target="RFC6901">RFC 6901, Section 3</xref> ("Syntax").
-                </postamble>
-            </figure>
             <t>
+                The ABNF syntax of a Relative JSON Pointer is:
             </t>
+            <sourcecode type="abnf9110"><![CDATA[
+  relative-json-pointer = origin-specification json-pointer
+                        / origin-specification "#"
+                        ; json-pointer from RFC 6901
+
+  origin-specification  = non-negative-integer [ index-manipulation ]
+  index-manipulation    = ( "+" / "-" ) non-negative-integer
+  non-negative-integer  = "0" / %x31-39 *DIGIT
+                        ; zero, or digits without a leading zero
+]]></sourcecode>
         </section>
 
         <section title="Evaluation">
@@ -329,6 +322,12 @@
             </t>
             <t>
                 <list style="hanging">
+                    <t hangText="draft-handrews-relative-json-pointer-03">
+                        <list style="symbols">
+                            <t>Fix ABNF omission for using # with index manipulation</t>
+                            <t>Clarify handling of leading "0"</t>
+                        </list>
+                    </t>
                     <t hangText="draft-bhutton-relative-json-pointer-00">
                         <list style="symbols">
                             <t>Add array forward and backward index manipulation</t>