diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ecd19139754..5c9016028b0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -711,7 +711,7 @@ peps/pep-0832.rst  @brettcannon
 peps/pep-0833.rst  @dstufft
 peps/pep-0835.rst  @ilevkivskyi
 peps/pep-0836.rst  @savannahostrowski @Fidget-Spinner @brandtbucher
-peps/pep-0840.rst  @jeremyhylton
+peps/pep-0840.rst  @jeremyhylton @gvanrossum
 # ...
 peps/pep-2026.rst  @hugovk
 # ...
diff --git a/peps/pep-0840.rst b/peps/pep-0840.rst
index fcade175540..8e9fe2b18ca 100644
--- a/peps/pep-0840.rst
+++ b/peps/pep-0840.rst
@@ -1,10 +1,13 @@
 PEP: 840
 Title: Name Resolution in Class Namespaces
-Author: Jeremy Hylton <jeremy@python.org>
+Author: Jeremy Hylton <jeremy@python.org>,
+        Guido van Rossum <guido@python.org>
+Discussions-To: https://discuss.python.org/t/pep-840-name-resolution-in-class-namespaces/108166
 Status: Draft
 Type: Standards Track
 Created: 15-Jul-2026
 Python-Version: 3.16
+Post-History: `16-Jul-2026 <https://discuss.python.org/t/pep-840-name-resolution-in-class-namespaces/108166>`__
 
 
 Abstract