diff --git a/doc/dev_ref/mistakes.rst b/doc/dev_ref/mistakes.rst
index 5c33fa835a0..324f88d4d92 100644
--- a/doc/dev_ref/mistakes.rst
+++ b/doc/dev_ref/mistakes.rst
@@ -49,6 +49,8 @@ This was used in the public key interfaces and the hierarchy is a tangle.
 Public and private keys should be distinct classes, with a function on private
 keys that creates a new object corresponding to the public key.
 
+[This is planned to be fixed in Botan4]
+
 Cipher Interface
 ------------------
 
diff --git a/doc/roadmap.rst b/doc/roadmap.rst
index e7b23d41128..e467fce7f4f 100644
--- a/doc/roadmap.rst
+++ b/doc/roadmap.rst
@@ -5,39 +5,37 @@ Development Roadmap
 Near Term Plans
 ----------------------------------------
 
-Here is an outline for the development plans over the next 12-24 months,
-as of May 2024.
+Here is an outline of the development plans over the next ~12 months,
+as of December 2024.
 
-Botan 2
+Botan2
 ---------------
 
-Botan 2 is still supported, but no further feature work is planned.
+Botan2 is still supported, but no further feature work is planned.
 Only security issues and serious bugs will be addressed.
 
-Botan 3
----------------
+Currently, Botan2 is scheduled to reach end of life at the end of 2024.
 
-The following future work is currently planned for Botan 3:
+Botan3
+---------------
 
-* BSI Project 481 [https://github.com/randombit/botan/issues/3108]
-  will add several new post-quantum algorithms including LMS signatures
-  and Classic McEliece.
+The following future work is currently planned for Botan3:
 
 * New ECC based password authenticated key exchanges, to replace SRP.
-  The most likely candidate algorithms are CPace and OPAQUE.
+  The most likely candidate algorithms are SPAKE2(+) and CPace.
 
 * Adding an implementation of BLS12-381 elliptic curve pairing.
 
-* Low level integer math and elliptic curve arithmetic optimizations.
+* HPKE (RFC 9180)
 
-Botan 4
+Botan4
 ---------------
 
 At this time there is no immediate plan for a new major version. When it occurs,
 it will remove functionality currently marked as deprecated, and adopt a new C++
 version. This is unlikely to occur before 2027, at the earliest.
 
-One major change already planned for Botan 4 is that in this release, Public_Key
+One major change already planned for Botan4 is that in that release, Public_Key
 will no longer derive from Private_Key. And similarly, specific private keys
 (for example RSA_PrivateKey) will no longer derive from their corresponding
 public key type.