diff --git a/CHANGES.rst b/CHANGES.rst
index 85cc9ed0d4e0669976ef91c84fe8693461a45eba..9cba792c8aa22dd2f7dabc2dcb430fcefe8bda3c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -203,6 +203,11 @@ Node
   is classified as ``branch_delayed`` with the
   ``prevalidation.operation_conflict`` error. (MR :gl:`!9314`)
 
+- In RPC ``/protocol_data``, ``"per_block_votes"`` replaces ``"liquidity_baking_toggle_vote"``;
+  ``"per_block_votes"`` has two properties ``"liquidity_baking_vote"`` and ``"adaptive_inflation_vote"``.
+  A vote is one of ``"on"``, ``"off"``, ``"pass"``.
+
+
 Client
 ------
 - Adding client commands to generate, open and verify a time-lock.
@@ -217,9 +222,10 @@ Baker
   data directory when searching an existing file. The previous
   semantics, which looks for this file in the current working
   directory, takes predecence.
-- Bakers are now required to set their votes for the adoption of the
-  adaptive inflation feature. They may use the per block votes file,
-  or CLI option ``--adaptive-inflation-vote``.
+- Bakers are now asked (but not required) to set their votes for the adoption of the
+  adaptive inflation feature. They may use the CLI option ``--adaptive-inflation-vote``
+  or the per-block votes file (which is re-read at each block, and overrides the CLI option).
+  Absence of vote is equivalent to voting "pass".
 
 - Rename ``endorsement`` into ``attestation`` for baker errors and events.
   (MR :gl:`!9195`)
diff --git a/docs/protocols/018_oxford.rst b/docs/protocols/018_oxford.rst
index 02e4491210a6838f6bc276a395784e80964d2d74..140e8c14c415696f08b367276e20784975d23902 100644
--- a/docs/protocols/018_oxford.rst
+++ b/docs/protocols/018_oxford.rst
@@ -48,16 +48,18 @@ Zero Knowledge Rollups (ongoing)
 Data Availability Layer (ongoing)
 ---------------------------------
 
-Adaptive Inflation (ongoing)
-----------------------------
+Adaptive Inflation
+------------------
 
 - This protocol asks the bakers to set their votes for the adoption of
   the adaptive inflation feature. They may use the per-block votes
-  file, or CLI option ``--adaptive-inflation-vote``. If they do
-  not vote for the adaptive inflation feature, the vote defaults to
-  "pass" (unlike for the liquidity baking vote, which is mandatory).
-
-- Introduce feature flag for Adaptive Inflation. (MR :gl:`!8566`)
+  file, or CLI option ``--adaptive-inflation-vote``. If they do not
+  vote for the adaptive inflation feature, the vote defaults to
+  ``"pass"`` (unlike for the liquidity baking toggle vote, which is
+  mandatory). As for the liquidity baking toggle vote, the value in
+  the per-block votes file is read at each block (so the baker does
+  not have to restart in case the value has changed in the file), and
+  overrides the value of the CLI option if any.
 
 - Add parameter ``staking_over_baking_limit`` as the limit of co-staked tokens over the baked tokens for a given baker. (MR :gl:`!8744`)