--- a/media-source/media-source.html	Mon Jul 30 13:20:07 2012 -0700
+++ b/media-source/media-source.html	Thu Aug 09 10:19:37 2012 -0700
@@ -853,7 +853,7 @@
     <h3 id="iso">6.2 ISO Base Media File Format Byte Streams</h3>
     <div class="nonnormative">
       <p>This section defines segment formats for implementations that choose to support the ISO Base Media File Format
-	<a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=51533">ISO/IEC 14496-12</a> (ISO BMFF).</p> 
+	<a href="http://standards.iso.org/ittf/PubliclyAvailableStandards/c061988_ISO_IEC_14496-12_2012.zip">ISO/IEC 14496-12</a> (ISO BMFF).</p> 
       <h4 id="iso-init-segments">6.2.1. Initialization Segments</h4>
       <p>An ISO BMFF <a href="#init-segment">initialization segment</a> shall contain a single Movie Header Box (<strong>moov</strong>). The tracks in the Movie Header Box shall not contain any samples (i.e. the <strong><var>entry_count</var></strong> in the <strong>stts</strong>, <strong>stsc</strong> and <strong>stco</strong> boxes shall be set to zero). A Movie Extends (<strong>mvex</strong>) box shall be contained in the
 	Movie Header Box to indicate that Movie Fragments are to be expected.</p>
@@ -870,15 +870,13 @@
 	<li>The Media Data Boxes shall contain all the samples referenced by the Track Run Boxes (<strong>trun</strong>) of the Movie Fragment Box.</li>
       </ol>
 
-      <p>The Track Fragment Decode Time Box is defined in <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59147">ISO/IEC 14496-12 Amendment 3</a>.</p>
-
       <h4 id="iso-start-timestamp">6.2.3. Establishing the Presentation Start Timestamp</h4>
       <p>The earliest presentation timestamp of any sample of the first media segment appended establishes the <a href="#presentation-start-time">presentation start time</a>. All media segments appended after this first segment are expected to have presentation timestamps greater than or equal to this timestamp.</p>
       <p>If for some reason a web application doesn't want to append data at the beginning of the timeline, it can establish the <a href="#presentation-start-time">presentation start time</a> by appending a Movie Fragment Box containing a Track Fragment Box
 	containing a Track Fragment Decode Time Box. The <a href="#presentation-start-time">presentation start time</a> is then the presentation time of a hypothetical sample with zero composition offset. This must be done before any other media segments are appended.</p>
 
       <h4 id="iso-random-access-points">6.2.4. Random Access Points</h4>
-      <p>A <a href="#random-access-point">random access point</a> as defined in this specification corresponds to a Stream Access Point of type 1 or 2 as defined in Annex I of <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59147">ISO/IEC 14496-12 Amendment 3</a>.</p>
+      <p>A <a href="#random-access-point">random access point</a> as defined in this specification corresponds to a Stream Access Point of type 1 or 2 as defined in Annex I of <a href="http://standards.iso.org/ittf/PubliclyAvailableStandards/c061988_ISO_IEC_14496-12_2012.zip">ISO/IEC 14496-12</a>.</p>
     </div>
 
     <h2 id="examples">7. Examples</h2>

--- a/media-source/media-source.xml	Mon Jul 30 13:20:07 2012 -0700
+++ b/media-source/media-source.xml	Thu Aug 09 10:19:37 2012 -0700
@@ -820,7 +820,7 @@
     <h3 id="iso">6.2 ISO Base Media File Format Byte Streams</h3>
     <div class="nonnormative">
       <p>This section defines segment formats for implementations that choose to support the ISO Base Media File Format
-	<a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=51533">ISO/IEC 14496-12</a> (ISO BMFF).</p> 
+	<iso-14496-12/> (ISO BMFF).</p> 
       <h4 id="iso-init-segments">6.2.1. Initialization Segments</h4>
       <p>An ISO BMFF <init-segment/> shall contain a single Movie Header Box (<iso-box>moov</iso-box>). The tracks in the Movie Header Box shall not contain any samples (i.e. the <iso-var>entry_count</iso-var> in the <iso-box>stts</iso-box>, <iso-box>stsc</iso-box> and <iso-box>stco</iso-box> boxes shall be set to zero). A Movie Extends (<iso-box>mvex</iso-box>) box shall be contained in the
 	Movie Header Box to indicate that Movie Fragments are to be expected.</p>
@@ -837,15 +837,13 @@
 	<li>The Media Data Boxes shall contain all the samples referenced by the Track Run Boxes (<iso-box>trun</iso-box>) of the Movie Fragment Box.</li>
       </ol>
 
-      <p>The Track Fragment Decode Time Box is defined in <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59147">ISO/IEC 14496-12 Amendment 3</a>.</p>
-
       <h4 id="iso-start-timestamp">6.2.3. Establishing the Presentation Start Timestamp</h4>
       <p>The earliest presentation timestamp of any sample of the first media segment appended establishes the <presentation-start-time/>. All media segments appended after this first segment are expected to have presentation timestamps greater than or equal to this timestamp.</p>
       <p>If for some reason a web application doesn't want to append data at the beginning of the timeline, it can establish the <presentation-start-time/> by appending a Movie Fragment Box containing a Track Fragment Box
 	containing a Track Fragment Decode Time Box. The <presentation-start-time/> is then the presentation time of a hypothetical sample with zero composition offset. This must be done before any other media segments are appended.</p>
 
       <h4 id="iso-random-access-points">6.2.4. Random Access Points</h4>
-      <p>A <random-access-point/> as defined in this specification corresponds to a Stream Access Point of type 1 or 2 as defined in Annex I of <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59147">ISO/IEC 14496-12 Amendment 3</a>.</p>
+      <p>A <random-access-point/> as defined in this specification corresponds to a Stream Access Point of type 1 or 2 as defined in Annex I of <iso-14496-12/>.</p>
     </div>
 
     <h2 id="examples">7. Examples</h2>

--- a/media-source/spec-html.xsl	Mon Jul 30 13:20:07 2012 -0700
+++ b/media-source/spec-html.xsl	Thu Aug 09 10:19:37 2012 -0700
@@ -569,4 +569,8 @@
   <xsl:template match="//iso-var">
     <strong><var><xsl:value-of select="." /></var></strong>
   </xsl:template>
+
+  <xsl:template match="//iso-14496-12">
+    <a href="http://standards.iso.org/ittf/PubliclyAvailableStandards/c061988_ISO_IEC_14496-12_2012.zip">ISO/IEC 14496-12</a>
+  </xsl:template>
 </xsl:stylesheet>