diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5d6eadaa81d55a2bfdd13095c2e8d5da47f02b6..f42f7917d5c14b87c31ab17e87fa0ab33c7241b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,24 @@ Project Coordinators: Marco Clemencic @clemenci, Charles Leggett @leggett
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 
+## [v36r12][] - 2023-03-20
+Another minor release requested by LHCb.  The main change is that now
+`OutputStream` creates the output file during the *start* transition instead of
+when trying to write the first selected event.  This means that output files
+might be created and left empty rather than not created.  The rationale for
+this change is to have a more predicatble behaviour (one that does not depend
+on the job details).
+
+### Changed
+- Always write output files (gaudi/Gaudi!1432)
+
+### Added
+- GaudiConfig2: add clone for Configurable (gaudi/Gaudi!1433)
+
+### Fixed
+- GaudiKernel: flake8 fixes (gaudi/Gaudi!1434)
+
+
 ## [v36r11][] - 2023-02-27
 Just a minor update to pick up some changes that didn't make it for v36r10.
 
@@ -1047,6 +1065,7 @@ Details about old versions of the project can be found in the
 [GaudiRelease/doc](GaudiRelease/doc).
 
 
+[v36r12]: https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v36r12
 [v36r11]: https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v36r11
 [v36r10]: https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v36r10
 [v36r9]: https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v36r9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbef628462c5e3c76c8ba56f8825ec114206f03..a5dfcf40b0793ef4e5889f67d4c3d4507c7b0190 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ Maintainer's guide: `<https://twiki.cern.ch/twiki/bin/view/LHCb/MaintainGaudiCMa
 
 cmake_minimum_required(VERSION 3.15)
 
-project(Gaudi VERSION 36.11
+project(Gaudi VERSION 36.12
               LANGUAGES CXX
               DESCRIPTION "Gaudi Software Framework"
               HOMEPAGE_URL "https://cern.ch/gaudi")
diff --git a/docs/source/conf.py b/docs/source/conf.py
index fe2343f4ce937c4def150b146c6a1a86662d49ed..ff86e26662794ef13191660ce0f9573fb387f5dc 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -22,9 +22,9 @@ copyright = "1998-2023, CERN for the benefit of the LHCb and ATLAS collaboration
 author = "The Gaudi Developers"
 
 # The short X.Y version
-version = "36.11"
+version = "36.12"
 # The full version, including alpha/beta/rc tags
-release = "v36r11"
+release = "v36r12"
 
 # -- General configuration ---------------------------------------------------