diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ca497a..d8889f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["pypy-3.7", "pypy3"]
+        - ["pypy-3.9", "pypy3"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
 
diff --git a/.meta.toml b/.meta.toml
index 9c7cd6c..fcae74a 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "d03ad585"
+commit-id = "b21fbbf2"
 
 [python]
 with-pypy = true
@@ -20,6 +20,7 @@ fail-under = 84
 
 [manifest]
 additional-rules = [
+    "include *.yaml",
     "recursive-include docs *.bat",
     "recursive-include src *.html",
     "recursive-include src *.pt",
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..034043e
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,25 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/requirements.txt
+  - method: pip
+    path: .
diff --git a/MANIFEST.in b/MANIFEST.in
index c91d8e0..f8dd50e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,6 +12,7 @@ recursive-include docs *.txt
 recursive-include docs Makefile
 
 recursive-include src *.py
+include *.yaml
 recursive-include docs *.bat
 recursive-include src *.html
 recursive-include src *.pt
diff --git a/doc-requirements.txt b/doc-requirements.txt
deleted file mode 100644
index e9704b8..0000000
--- a/doc-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-.[docs]
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000..ba3a8bf
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,3 @@
+Sphinx
+repoze.sphinx.autointerface
+zope.tal
diff --git a/setup.cfg b/setup.cfg
index ebb8516..b07af40 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE
diff --git a/tox.ini b/tox.ini
index 442ee82..ccc8c22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,8 @@ envlist =
 
 [testenv]
 usedevelop = true
+package = wheel
+wheel_build_env = .pkg
 deps =
 commands =
     zope-testrunner --test-path=src {posargs:-vc}