diff --git a/index.html b/index.html
index 6b1dd437..4d0a5793 100644
--- a/index.html
+++ b/index.html
@@ -1030,8 +1030,9 @@ <h3>Algorithm</h3>
                   characters are treated in URI references, per
                   <a data-cite="RFC3987#section-6.5">section 6.5</a>
                   of [[RFC3987]].</li>
-                <li>If <var>context</var> is in the <var>remote contexts</var> array, a
-                  <a data-link-for="JsonLdErrorCode">recursive context inclusion</a>
+                <li>If the number of entries in the <var>remote contexts</var> array
+                  exceeds a processor defined limit, a
+                  <a data-link-for="JsonLdErrorCode">context overflow</a>
                   error has been detected and processing is aborted;
                   otherwise, add <var>context</var> to <var>remote contexts</var>.</li>
                 <li class="changed">If <var>context</var> was previously dereferenced,
@@ -5437,7 +5438,7 @@ <h4>JsonLdErrorCode</h4>
             "loading remote context failed",
             "multiple context link headers",
             "processing mode conflict",
-            "recursive context inclusion"
+            "context overflow"
         };
       --></pre>
 
@@ -5551,8 +5552,8 @@ <h4>JsonLdErrorCode</h4>
         <dt><dfn>processing mode conflict</dfn></dt>
         <dd>An attempt was made to change the <a>processing mode</a>
           which is incompatible with the previous specified version.</dd>
-        <dt><dfn>recursive context inclusion</dfn></dt>
-        <dd>A cycle in remote context inclusions has been detected.</dd>
+        <dt><dfn>context overflow</dfn></dt>
+        <dd>maximum number of <code>@context</code> URLs exceeded.</dd>
       </dl>
     </section>
   </section> <!-- end of Error Handling -->
@@ -5680,6 +5681,8 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
       or all <a>JSON-LD script elements</a>.</li>
     <li>Added <a data-link-for="RemoteDocument">contentType</a> field to <a>RemoteDocument</a>.</li>
     <li>Added support for sealed <a>contexts</a> and <a>term definitions</a>.</li>
+    <li>Because scoped contexts can lead to contexts being reloaded, replace the
+      <strong>recursive context inclusion</strong> error with a <a data-link-for="JsonLdErrorCode">context overflow</a> error.</li>
   </ul>
 </section>
 
diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
index 36a73c98..098b620d 100644
--- a/tests/expand-manifest.jsonld
+++ b/tests/expand-manifest.jsonld
@@ -932,14 +932,16 @@
       "name": "A context may not include itself recursively (direct)",
       "purpose": "Verifies that an exception is raised on expansion when processing a context referencing itself",
       "input": "expand/e002-in.jsonld",
-      "expect": "recursive context inclusion"
+      "expect": "recursive context inclusion",
+      "option": {"specVersion": "json-ld-1.0"}
     }, {
       "@id": "#te003",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
       "name": "A context may not include itself recursively (indirect)",
       "purpose": "Verifies that an exception is raised on expansion when processing a context referencing itself indirectly",
       "input": "expand/e003-in.jsonld",
-      "expect": "recursive context inclusion"
+      "expect": "recursive context inclusion",
+      "option": {"specVersion": "json-ld-1.0"}
     }, {
       "@id": "#te004",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],