diff --git a/scripts/build-npa-book.mjs b/scripts/build-npa-book.mjs
index ebe801e2..1488c636 100644
--- a/scripts/build-npa-book.mjs
+++ b/scripts/build-npa-book.mjs
@@ -100,7 +100,16 @@ async function renderChapter(chapter, markdown) {
     if (!list.length) return;
     html.push("<ul>");
     for (const item of list) {
-      html.push(`<li>${formatInline(item)}</li>`);
+      html.push(
+        `<li class="doc-block" data-section="${
+          chapter.number
+        }" data-text="${escapeAttribute(item)}">`,
+      );
+      html.push(formatInline(item));
+      html.push(
+        `<a class="bug-link" title="Report an issue with this section" aria-label="Report issue"></a>`,
+      );
+      html.push("</li>");
     }
     html.push("</ul>");
     list = [];
@@ -131,22 +140,40 @@ async function renderChapter(chapter, markdown) {
       if (sourceLevel === 1) {
         title = headingText;
         html.push(`<p class="chapter-kicker">Section ${chapter.number}</p>`);
+        html.push(
+          `<div class="doc-block" data-section="${
+            chapter.number
+          }" data-text="${escapeAttribute(headingText)}">`,
+        );
         html.push(
           `<h${outputLevel} id="${headingId}" class="chapter-title">${formatInline(
             headingText,
           )}</h${outputLevel}>`,
         );
+        html.push(
+          `<a class="bug-link" title="Report an issue with this section" aria-label="Report issue"></a>`,
+        );
+        html.push(`</div>`);
       } else {
         headings.push({
           id: headingId,
           title: headingText,
           level: sourceLevel,
         });
+        html.push(
+          `<div class="doc-block" data-section="${
+            chapter.number
+          }" data-text="${escapeAttribute(headingText)}">`,
+        );
         html.push(
           `<h${outputLevel} id="${headingId}">${formatInline(
             headingText,
           )}</h${outputLevel}>`,
         );
+        html.push(
+          `<a class="bug-link" title="Report an issue with this section" aria-label="Report issue"></a>`,
+        );
+        html.push(`</div>`);
       }
       continue;
     }