diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b2714f6..195e28f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', 'pypy-3.8']
+        python-version: [3.7, 3.8, 3.9, '3.10', 'pypy-3.8']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f52ea79..61188c7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: python-check-blanket-noqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.6.0
     hooks:
       - id: check-merge-conflict
       - id: check-yaml
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..dd2aa46
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#     - requirements: docs/requirements.txt
diff --git a/NEWS.rst b/NEWS.rst
index 979e833..94f1d3d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -64,7 +64,7 @@ Release History
 ^^^^^^^^^^^^^^^^^^
 
 * Thanks to the welcome efforts of Jannis Leidel, contextlib2 is now a
-  [Jazzband](https://jazzband.co/) project! This means that I (Nick Coghlan)
+  [Jazzband](https://jazzband.co/) project! This means that I (Alyssa Coghlan)
   am no longer a single point of failure for backports of future contextlib
   updates to earlier Python versions.
 
diff --git a/docs/conf.py b/docs/conf.py
index 49f74a9..600d17c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'contextlib2'
-copyright = u'2021, Nick Coghlan'
+copyright = u'2024, Alyssa Coghlan'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -180,7 +180,7 @@ htmlhelp_basename = 'contextlib2doc'
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'contextlib2.tex', u'contextlib2 Documentation',
-   u'Nick Coghlan', 'manual'),
+   u'Alyssa Coghlan', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -213,7 +213,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'contextlib2', u'contextlib2 Documentation',
-     [u'Nick Coghlan'], 1)
+     [u'Alyssa Coghlan'], 1)
 ]
 
 
diff --git a/setup.py b/setup.py
index dc64785..523169c 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
     license='PSF License',
     description='Backports and enhancements for the contextlib module',
     long_description=open('README.rst').read(),
-    author='Nick Coghlan',
+    author='Alyssa Coghlan',
     author_email='ncoghlan@gmail.com',
     url='http://contextlib2.readthedocs.org',
     classifiers=[
diff --git a/tox.ini b/tox.ini
index 43a90fa..02bffd4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py{36,37,38,39,3_10,py3}
+# No Python 3.6 available on current generation GitHub test runners
+envlist = py{37,38,39,3.10,py3}
 skip_missing_interpreters = True
 
 [testenv]
@@ -8,16 +9,16 @@ commands =
     coverage report
     coverage xml
     # mypy won't install on PyPy, so only run the typechecking on CPython
-    !pypy3: python -m mypy.stubtest --allowlist dev/mypy.allowlist contextlib2
+    # Typechecking is currently failing: https://github.com/jazzband/contextlib2/issues/54
+    # !pypy3: python -m mypy.stubtest --allowlist dev/mypy.allowlist contextlib2
 deps =
     coverage
     !pypy3: mypy
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
-    3.10: py3_10
-    pypy3: pypy3
+    3.10: py3.10
+    pypy-3.8: pypy3