diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index b5122484b3..9823a0d376 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -232,7 +232,7 @@
                                 <a class="btn btn-sm btn-warning mb-3"
                                 target="_blank"
                                 href="https://github.com/ietf-tools/datatracker/issues/new/choose">
-                                    Report a bug
+                                    Report a datatracker bug
                                     <i class="bi bi-bug"></i>
                                 </a>
                             </div>
diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
index c9a73eafbf..392c5f124b 100644
--- a/ietf/templates/doc/document_info.html
+++ b/ietf/templates/doc/document_info.html
@@ -26,9 +26,17 @@
                 {% endif %}
                 {% if document_html %}<br>{% endif %}
                 {% if has_verified_errata or has_errata %}
-                    <a class="{% if document_html %}btn btn-danger btn-sm my-1{% else %}badge rounded-pill bg-danger text-decoration-none text-light{% endif %}"
+                    <a class="{% if document_html %}btn btn-primary btn-sm my-1{% else %}badge rounded-pill bg-danger text-decoration-none text-light{% endif %}"
                        href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}" title="Click to view errata." rel="nofollow">
-                        Errata
+                        {% if document_html %}View errata{% else %}Errata{% endif %}
+                    </a>
+                {% endif %}
+                {% if document_html and doc.get_state_slug == "rfc" and not snapshot %}
+                    <a class="btn btn-sm btn-warning"
+                       title="Click to report an error in the document."
+                       href="https://www.rfc-editor.org/errata.php#reportnew"
+                       target="_blank">
+                        Report errata
                     </a>
                 {% endif %}
                 {% if doc.related_ipr %}