diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index aed0ac995..0c0944e8f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -91,7 +91,6 @@ jobs:
     - name: Package binaries (macOS/x64)
       if: startsWith(matrix.os, 'macos') && runner.arch == 'X64'
       run: zip alr-nightly-bin-x86_64-macos.zip bin/alr* LICENSE.txt alr-*.txt
-
     - name: Package binaries (macOS/arm64)
       if: startsWith(matrix.os, 'macos') && runner.arch == 'ARM64'
       run: zip alr-nightly-bin-aarch64-macos.zip bin/alr* LICENSE.txt alr-*.txt
diff --git a/RELEASING.md b/RELEASING.md
index acbe52d81..fe938343b 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -20,6 +20,7 @@
   - Tag corresponding commit as vX.X.X (github does it if missing).
   - Use autogenerated release notes.
   - Credit all collaborators (if release notes aren't exhaustive).
+1. Update Alire.Version and alire.toml to -dev in release branch.
 1. [ ] Update stable version used in alire-index workflows
   - We used to use default in setup-alire, but by making it explicit we can
     test the new release before making it the default for everyone (next step).
diff --git a/alire.toml b/alire.toml
index a2e72c926..4dc401d7f 100644
--- a/alire.toml
+++ b/alire.toml
@@ -50,7 +50,6 @@ windows = { ALIRE_OS = "windows" }
 
 # Some dependencies require precise versions during the development cycle:
 [[pins]]
-
 [pins.aaa]
 url    = "https://github.com/mosteo/aaa"
 commit = "0c3b440ac183c450345d4a67d407785678779aae"
@@ -58,7 +57,6 @@ commit = "0c3b440ac183c450345d4a67d407785678779aae"
 [pins.ada_toml]
 url    = "https://github.com/mosteo/ada-toml"
 commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d"
-
 [pins.c_strings]
 url    = "https://github.com/mosteo/cstrings"
 commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf"
@@ -66,7 +64,6 @@ commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf"
 [pins.clic]
 url    = "https://github.com/alire-project/clic"
 commit = "56bbdc008e16996b6f76e443fd0165a240de1b13"
-
 [pins.den]
 url    = "https://github.com/mosteo/den"
 commit = "35d1f38395b93766dd64bca5901ce3b6a416ba1a"
diff --git a/src/alire/alire-version.ads b/src/alire/alire-version.ads
index 441a826dc..a3aba7eec 100644
--- a/src/alire/alire-version.ads
+++ b/src/alire/alire-version.ads
@@ -17,6 +17,7 @@ private
    --  "_or_later" after build.
 
    Current_Str : constant String := "2.1-dev";
+   --  2.0.1:     fix `alr install` and minor fixes
    --  2.0.0:     alr settings refactor and minor fixes
    --  2.0.0-rc1: release candidate for 2.0
    --  2.0.0-b1:  first public release on the 2.0 branch
diff --git a/src/alire/os_windows/alire-settings-builtins-windows.ads b/src/alire/os_windows/alire-settings-builtins-windows.ads
index abeaccf54..34ed843f1 100644
--- a/src/alire/os_windows/alire-settings-builtins-windows.ads
+++ b/src/alire/os_windows/alire-settings-builtins-windows.ads
@@ -1,3 +1,5 @@
+with AAA.Strings;
+
 --  Ensure config is loaded for some defaults below
 with Alire.Cache;
 with Alire.Settings.Edit.Early_Load;
@@ -5,9 +7,15 @@ pragma Unreferenced (Alire.Settings.Edit.Early_Load);
 
 package Alire.Settings.Builtins.Windows is
 
+   Latest_Msys2 : constant String := "2024-05-07";
+   --  Update here to upgrade to the latest release
+
+   Date_1 : String renames Latest_Msys2;
+   Date_2 : String renames AAA.Strings.Replace (Date_1, "-", "");
+
    pragma Style_Checks ("M200");
    Default_Msys2_Installer_URL : constant String
-     := "https://github.com/msys2/msys2-installer/releases/download/2024-01-13/msys2-x86_64-20240113.exe";
+     := "https://github.com/msys2/msys2-installer/releases/download/" & Date_1 & "/msys2-x86_64-" & Date_2 & ".exe";
    pragma Style_Checks ("M80");
 
    Default_Msys2_Installer : constant String