diff --git a/complete.html b/complete.html
index e9f4f198c86..8eb4cf5db76 100644
--- a/complete.html
+++ b/complete.html
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 3 May 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 4 May 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -14339,11 +14339,10 @@ <h5 id=pragma-directives><span class=secno>4.2.5.3 </span>Pragma directives</h5>
     the character encoding name of the <a href=#character-encoding-declaration>character encoding
     declaration</a>.</p>
 
-    <p>If the document contains a <code><a href=#the-meta-element>meta</a></code> element with an
-    <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in
-    the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
-    declaration state</a>, then the document must not contain a
-    <code><a href=#the-meta-element>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
+    <p>A document must not contain both a <code><a href=#the-meta-element>meta</a></code> element
+    with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>
+    attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
+    state</a> and a <code><a href=#the-meta-element>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
 
     <p>The <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
     declaration state</a> may be used in <a href=#html-documents>HTML
@@ -14682,14 +14681,16 @@ <h5 id=charset><span class=secno>4.2.5.5 </span>Specifying the document's charac
    completely within the first 1024 bytes of the document.</span></li>
    <!-- span is for historical reasons, to keep an old ID alive -->
 
-   <li>There can only be one character encoding declaration in the
-   document.</li> <!-- conformance criteria for this one are given in
-   the XML spec, the <meta> section just after defining charset="",
-   and the character encoding pragma section. And actually this
-   statement isn't quite true, since you can have an XML one and an
-   HTML one at the same time if they match. -->
+  </ul><p>In addition, due to a number of restrictions on <code><a href=#the-meta-element>meta</a></code>
+  elements, there can only be one <code><a href=#the-meta-element>meta</a></code>-based character
+  encoding declaration per document.</p> <!-- conformance criteria for
+  this one are given in the XML spec, the <meta> section just after
+  defining charset="", and the character encoding pragma section. Note
+  that you _can_ have two character encoding declaration per document,
+  if the document is an XML document and one is an XML declaration,
+  the other is <meta charset>, and the encoding is UTF-8. -->
 
-  </ul><p>If an <a href=#html-documents title="HTML documents">HTML document</a> does not
+  <p>If an <a href=#html-documents title="HTML documents">HTML document</a> does not
   start with a BOM, and if its encoding is not explicitly given by
   <a href=#content-type title=Content-Type>Content-Type metadata</a>, and the
   document is not <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>, then the
diff --git a/index b/index
index adb4062d034..b8703452cf8 100644
--- a/index
+++ b/index
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 3 May 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 4 May 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -14365,11 +14365,10 @@ people expect to have work and what is necessary.
     the character encoding name of the <a href=#character-encoding-declaration>character encoding
     declaration</a>.</p>
 
-    <p>If the document contains a <code><a href=#the-meta-element>meta</a></code> element with an
-    <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in
-    the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
-    declaration state</a>, then the document must not contain a
-    <code><a href=#the-meta-element>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
+    <p>A document must not contain both a <code><a href=#the-meta-element>meta</a></code> element
+    with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>
+    attribute in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
+    state</a> and a <code><a href=#the-meta-element>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
 
     <p>The <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
     declaration state</a> may be used in <a href=#html-documents>HTML
@@ -14708,14 +14707,16 @@ people expect to have work and what is necessary.
    completely within the first 1024 bytes of the document.</span></li>
    <!-- span is for historical reasons, to keep an old ID alive -->
 
-   <li>There can only be one character encoding declaration in the
-   document.</li> <!-- conformance criteria for this one are given in
-   the XML spec, the <meta> section just after defining charset="",
-   and the character encoding pragma section. And actually this
-   statement isn't quite true, since you can have an XML one and an
-   HTML one at the same time if they match. -->
+  </ul><p>In addition, due to a number of restrictions on <code><a href=#the-meta-element>meta</a></code>
+  elements, there can only be one <code><a href=#the-meta-element>meta</a></code>-based character
+  encoding declaration per document.</p> <!-- conformance criteria for
+  this one are given in the XML spec, the <meta> section just after
+  defining charset="", and the character encoding pragma section. Note
+  that you _can_ have two character encoding declaration per document,
+  if the document is an XML document and one is an XML declaration,
+  the other is <meta charset>, and the encoding is UTF-8. -->
 
-  </ul><p>If an <a href=#html-documents title="HTML documents">HTML document</a> does not
+  <p>If an <a href=#html-documents title="HTML documents">HTML document</a> does not
   start with a BOM, and if its encoding is not explicitly given by
   <a href=#content-type title=Content-Type>Content-Type metadata</a>, and the
   document is not <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>, then the
diff --git a/source b/source
index 1841b4ebf1c..8c2210d0c81 100644
--- a/source
+++ b/source
@@ -15256,11 +15256,11 @@ people expect to have work and what is necessary.
     the character encoding name of the <span>character encoding
     declaration</span>.</p>
 
-    <p>If the document contains a <code>meta</code> element with an
-    <code title="attr-meta-http-equiv">http-equiv</code> attribute in
-    the <span title="attr-meta-http-equiv-content-type">Encoding
-    declaration state</span>, then the document must not contain a
-    <code>meta</code> element with the <code
+    <p>A document must not contain both a <code>meta</code> element
+    with an <code title="attr-meta-http-equiv">http-equiv</code>
+    attribute in the <span
+    title="attr-meta-http-equiv-content-type">Encoding declaration
+    state</span> and a <code>meta</code> element with the <code
     title="attr-meta-charset">charset</code> attribute present.</p>
 
     <p>The <span title="attr-meta-http-equiv-content-type">Encoding
@@ -15661,15 +15661,17 @@ people expect to have work and what is necessary.
    completely within the first 1024 bytes of the document.</span></li>
    <!-- span is for historical reasons, to keep an old ID alive -->
 
-   <li>There can only be one character encoding declaration in the
-   document.</li> <!-- conformance criteria for this one are given in
-   the XML spec, the <meta> section just after defining charset="",
-   and the character encoding pragma section. And actually this
-   statement isn't quite true, since you can have an XML one and an
-   HTML one at the same time if they match. -->
-
   </ul>
 
+  <p>In addition, due to a number of restrictions on <code>meta</code>
+  elements, there can only be one <code>meta</code>-based character
+  encoding declaration per document.</p> <!-- conformance criteria for
+  this one are given in the XML spec, the <meta> section just after
+  defining charset="", and the character encoding pragma section. Note
+  that you _can_ have two character encoding declaration per document,
+  if the document is an XML document and one is an XML declaration,
+  the other is <meta charset>, and the encoding is UTF-8. -->
+
   <p>If an <span title="HTML documents">HTML document</span> does not
   start with a BOM, and if its encoding is not explicitly given by
   <span title="Content-Type">Content-Type metadata</span>, and the