diff --git a/master_changes.md b/master_changes.md
index 7a0e46ef78b..05ce3709f86 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -53,6 +53,7 @@ users)
 ## Pin
   * Switch the default version when undefined from ~dev to dev [#4949 @kit-ty-kate]
   * ◈ New option `opam pin --current` to fix a package in its current state (avoiding pending reinstallations or removals from the repository) [#4973 @AltGr - fix #4970]
+  * [BUG] Fix opam file overlay writing when a locked file is found: it is written with preserved format, and it was the opam file that was taken, not the locked one [#5080 @rjbou - fix #4936]
 
 ## List
   * Some optimisations to 'opam list --installable' queries combined with other filters [#4882 @altgr - fix #4311]
@@ -92,6 +93,12 @@ users)
 ## Clean
   * [NEW] Add `--untracked` option to remove interactively untracked files [{4915 @rjbou - fix #4831]
 
+## Upgrade
+  * Handle lock files when upgrading pinned packages [#5080 @rjbou]
+
+## Update
+  * Handle lock files when environment variable is given [#5080 @rjbou]
+
 ## Opamfile
   *
 
@@ -274,11 +281,14 @@ users)
   * `OpamClient`: fix `update_with_init_config`, when ``jobs` was set in `init_config`, it dropped rest of `config` update [#5056 @rjbou]
   * Add an optional argument to `OpamArg.mk_subdoc` for extra default elements: `?extra_defaults:(validity * string * string) list` [#4910 @kit-ty-kate]
   * Add `OpamSwitchCommand.previous_switch` [#4910 @kit-ty-kate]
+  * `OpamAuxCommand`: add `?locked` (and handle lock file then) argument to `upgrade` and `upgrade_t` [#5080 @rjbou]
 ## opam-repository
   * `OpamRepositoryConfig`: add in config record `repo_tarring` field and as an argument to config functions, and a new constructor `REPOSITORYTARRING` in `E` environment module and its access function [#5015 @rjbou]
   * New download functions for shared source, old ones kept [#4893 @rjbou]
 
 ## opam-state
+  * `OpamPinned`: add `save_overlay` [#5080 @rjbou]
+  * `OpamPinned`: add `find_lock_file_in_source`, mirror of `find_opam_file_in_source` [#5080 @rjbou]
 ## opam-solver
   * `OpamCudf`: Change type of `conflict_case.Conflict_cycle` (`string list list` to `Cudf.package action list list`) and `cycle_conflict`, `string_of_explanations`, `conflict_explanations_raw` types accordingly [#4039 @gasche]
   * `OpamCudf`: add `conflict_cycles` [#4039 @gasche]