diff --git a/index.bs b/index.bs
index de0bebf94..936a9ef97 100644
--- a/index.bs
+++ b/index.bs
@@ -13642,10 +13642,11 @@ The following conformance classes are defined by this specification:
 
             pre.innerHTML = html;
             var fillWith = document.querySelectorAll("div[data-fill-with=\"grammar-" + pre.id.replace("prod-", "") + "\"]");
-            [].forEach.call(fillWith, div => div.innerHTML = wrap(html))
+            [].forEach.call(fillWith, div => div.innerHTML = wrap(html));
 
             if (!(/\bno-index\b/).test(pre.className)) {
-              output += html + "\n";
+              output += html.replace(/<emu-nt>/, "<emu-nt id=\"" + pre.id.replace("prod-", "index-prod-") + "\">")
+                .replace(/#prod-([^a-z])/g, "#index-prod-$1") + "\n";
             }
         });
         document.querySelector("div[data-fill-with=\"grammar-index\"]").innerHTML = wrap(output);