diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 986bb1c..fa684c2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,7 @@ jobs:
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
+        - ["3.12",  "py312"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
 
diff --git a/.meta.toml b/.meta.toml
index 177a3d0..c7a8e02 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "8f22a5de"
+commit-id = "4a6085d0"
 
 [python]
 with-windows = false
@@ -41,3 +41,12 @@ additional-install = [
     "sudo apt update",
     "sudo apt install -y ldap-utils slapd libldap2-dev libsasl2-dev",
     ]
+
+[readthedocs]
+build-extra = [
+    "apt_packages:",
+    "  - ldap-utils",
+    "  - slapd",
+    "  - libldap2-dev",
+    "  - libsasl2-dev",
+    ]
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 657f645..047163d 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -9,13 +9,13 @@ version: 2
 # Set the version of Python and other tools you might need
 build:
   os: ubuntu-22.04
+  tools:
+    python: "3.11"
   apt_packages:
     - ldap-utils
     - slapd
     - libldap2-dev
     - libsasl2-dev
-  tools:
-    python: "3.11"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/CHANGES.rst b/CHANGES.rst
index 6b1d052..8226382 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ releases, see the file `HISTORY.txt` in this folder.
 
 5.2 (unreleased)
 ----------------
+- add support for Python 3.12
 
 
 5.1 (2023-10-03)
diff --git a/setup.py b/setup.py
index 1d1c82b..c890ff3 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ def read(name):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
         "Topic :: Software Development",
diff --git a/tox.ini b/tox.ini
index 3443acd..f2a7c34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ envlist =
     py39
     py310
     py311
+    py312
     docs
     coverage
 
@@ -17,6 +18,9 @@ skip_install = true
 deps =
     zc.buildout >= 3.0.1
     wheel > 0.37
+setenv =
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands_pre =
     {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =